mariusz.pacek/keycloak
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prod changes

Browse Source 
KPR-145
Remove keycloak-as7-adapter-dist zip from the distribution zip files

KPR-146
Remove keycloak-jetty81-adapter-dist zip from the distribution zip files
This commit is contained in:
Lukas Kubik committed 2016-01-22 00:36:31 +01:00
1 parent f6612bcb30
commit 6db9aa355d
66 files changed
+323 -460
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

distribution/adapters/as7-eap6-adapter/pom.xml
+1 -1
View File
@@ -15,7 +15,7 @@
<modules>
<module>as7-modules</module>
<module>as7-adapter-zip</module>
<!--<module>as7-adapter-zip</module>-->
<module>eap6-adapter-zip</module>
</modules>
</project>
distribution/adapters/pom.xml
+7 -7
View File
@@ -16,15 +16,15 @@
<modules>
<module>as7-eap6-adapter</module>
<module>jetty81-adapter-zip</module>
<module>jetty91-adapter-zip</module>
<module>jetty92-adapter-zip</module>
<!--<module>jetty81-adapter-zip</module>-->
<!--<module>jetty91-adapter-zip</module>-->
<!--<module>jetty92-adapter-zip</module>-->
<module>js-adapter-zip</module>
<module>osgi</module>
<module>tomcat6-adapter-zip</module>
<module>tomcat7-adapter-zip</module>
<module>tomcat8-adapter-zip</module>
<module>wf8-adapter</module>
<!--<module>tomcat6-adapter-zip</module>-->
<!--<module>tomcat7-adapter-zip</module>-->
<!--<module>tomcat8-adapter-zip</module>-->
<!--<module>wf8-adapter</module>-->
<module>wildfly-adapter</module>
</modules>
</project>
distribution/feature-packs/adapter-feature-pack/pom.xml
+4 -4
View File
@@ -1,3 +1,4 @@
<?xml version="1.0"?>
<!--
~ JBoss, Home of Professional Open Source.
~ Copyright 2015 Red Hat, Inc., and individual contributors
@@ -15,8 +16,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.keycloak</groupId>
<artifactId>feature-packs-parent</artifactId>
@@ -57,7 +57,7 @@
<artifactId>keycloak-undertow-adapter</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<groupId>org.jboss.eap</groupId>
<artifactId>wildfly-feature-pack</artifactId>
<type>zip</type>
</dependency>
@@ -68,7 +68,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions></executions>
<executions/>
</plugin>
<plugin>
<groupId>org.wildfly.build</groupId>
distribution/feature-packs/pom.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<packaging>pom</packaging>
<modules>
<module>adapter-feature-pack</module>
<!-- <module>adapter-feature-pack</module>-->
<module>server-feature-pack</module>
</modules>
</project>
distribution/feature-packs/server-feature-pack/feature-pack-build.xml
+1 -1
View File
@@ -22,7 +22,7 @@
<build xmlns="urn:wildfly:feature-pack-build:1.1">
<dependencies>
<artifact name="org.wildfly:wildfly-feature-pack" />
<artifact name="org.jboss.eap:wildfly-feature-pack" />
</dependencies>
<config>
<standalone template="configuration/standalone/template.xml" subsystems="configuration/standalone/subsystems.xml" output-file="standalone/configuration/standalone.xml" />
distribution/feature-packs/server-feature-pack/pom.xml
+4 -4
View File
@@ -1,3 +1,4 @@
<?xml version="1.0"?>
<!--
~ JBoss, Home of Professional Open Source.
~ Copyright 2015 Red Hat, Inc., and individual contributors
@@ -15,8 +16,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.keycloak</groupId>
<artifactId>feature-packs-parent</artifactId>
@@ -49,7 +49,7 @@
<artifactId>keycloak-wildfly-server-subsystem</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<groupId>org.jboss.eap</groupId>
<artifactId>wildfly-feature-pack</artifactId>
<type>zip</type>
</dependency>
@@ -64,7 +64,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions></executions>
<executions/>
</plugin>
<plugin>
<groupId>org.wildfly.build</groupId>
distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/product.conf
+1 -1
View File
@@ -1 +1 @@
slot=keycloak
slot=rh-sso
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/product/keycloak/dir/META-INF/MANIFEST.MF → distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/product/rh-sso/dir/META-INF/MANIFEST.MF
+1 -1
View File
@@ -1,3 +1,3 @@
JBoss-Product-Release-Name: ${product.name}
JBoss-Product-Release-Version: ${product.version}
JBoss-Product-Console-Slot: main
JBoss-Product-Console-Slot: eap
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/product/keycloak/module.xml → distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/product/rh-sso/module.xml
+1 -1
View File
@@ -22,7 +22,7 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.product" slot="keycloak">
<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.product" slot="rh-sso">
<resources>
<resource-root path="dir"/>
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-mongo-update/main/module.xml
-19
View File
@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-connections-mongo-update">
<resources>
<artifact name="${org.keycloak:keycloak-connections-mongo-update}"/>
</resources>
<dependencies>
<module name="org.keycloak.keycloak-common"/>
<module name="org.keycloak.keycloak-core"/>
<module name="org.keycloak.keycloak-model-api"/>
<module name="org.keycloak.keycloak-connections-mongo"/>
<module name="org.mongodb.mongo-java-driver"/>
<module name="org.jboss.logging"/>
<module name="javax.api"/>
</dependencies>
</module>
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-mongo/main/module.xml
-18
View File
@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-connections-mongo">
<resources>
<artifact name="${org.keycloak:keycloak-connections-mongo}"/>
</resources>
<dependencies>
<module name="org.keycloak.keycloak-common"/>
<module name="org.keycloak.keycloak-core"/>
<module name="org.keycloak.keycloak-model-api"/>
<module name="org.mongodb.mongo-java-driver"/>
<module name="org.jboss.logging"/>
<module name="javax.api"/>
</dependencies>
</module>
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-mongo/main/module.xml
-23
View File
@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-events-mongo">
<resources>
<artifact name="${org.keycloak:keycloak-events-mongo}"/>
</resources>
<dependencies>
<module name="org.keycloak.keycloak-common"/>
<module name="org.keycloak.keycloak-core"/>
<module name="org.keycloak.keycloak-model-api"/>
<module name="org.keycloak.keycloak-events-api"/>
<module name="org.keycloak.keycloak-connections-mongo"/>
<module name="org.mongodb.mongo-java-driver"/>
<module name="org.codehaus.jackson.jackson-core-asl"/>
<module name="org.codehaus.jackson.jackson-mapper-asl"/>
<module name="org.codehaus.jackson.jackson-xc"/>
<module name="org.jboss.logging"/>
<module name="javax.api"/>
</dependencies>
</module>
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-mongo/main/module.xml
-19
View File
@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-model-mongo">
<resources>
<artifact name="${org.keycloak:keycloak-model-mongo}"/>
</resources>
<dependencies>
<module name="org.keycloak.keycloak-common"/>
<module name="org.keycloak.keycloak-core"/>
<module name="org.keycloak.keycloak-model-api"/>
<module name="org.keycloak.keycloak-connections-mongo"/>
<module name="org.mongodb.mongo-java-driver"/>
<module name="org.jboss.logging"/>
<module name="javax.api"/>
</dependencies>
</module>
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml
+4 -4
View File
@@ -16,8 +16,8 @@
<module name="org.keycloak.keycloak-connections-infinispan" services="import"/>
<module name="org.keycloak.keycloak-connections-jpa" services="import"/>
<module name="org.keycloak.keycloak-connections-jpa-liquibase" services="import"/>
<module name="org.keycloak.keycloak-connections-mongo" services="import"/>
<module name="org.keycloak.keycloak-connections-mongo-update" services="import"/>
<!--<module name="org.keycloak.keycloak-connections-mongo" services="import"/>
<module name="org.keycloak.keycloak-connections-mongo-update" services="import"/>-->
<module name="org.keycloak.keycloak-connections-truststore" services="import"/>
<module name="org.keycloak.keycloak-common" services="import"/>
<module name="org.keycloak.keycloak-core" services="import"/>
@@ -27,7 +27,7 @@
<module name="org.keycloak.keycloak-events-email" services="import"/>
<module name="org.keycloak.keycloak-events-jboss-logging" services="import"/>
<module name="org.keycloak.keycloak-events-jpa" services="import"/>
<module name="org.keycloak.keycloak-events-mongo" services="import"/>
<!-- <module name="org.keycloak.keycloak-events-mongo" services="import"/>-->
<module name="org.keycloak.keycloak-export-import-api" services="import"/>
<module name="org.keycloak.keycloak-export-import-dir" services="import"/>
<module name="org.keycloak.keycloak-export-import-single-file" services="import"/>
@@ -42,7 +42,7 @@
<module name="org.keycloak.keycloak-login-freemarker" services="import"/>
<module name="org.keycloak.keycloak-model-api" services="import"/>
<module name="org.keycloak.keycloak-model-jpa" services="import"/>
<module name="org.keycloak.keycloak-model-mongo" services="import"/>
<!-- <module name="org.keycloak.keycloak-model-mongo" services="import"/>-->
<module name="org.keycloak.keycloak-model-sessions-infinispan" services="import"/>
<module name="org.keycloak.keycloak-saml-core" services="import"/>
<module name="org.keycloak.keycloak-saml-protocol" services="import"/>
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/mongodb/mongo-java-driver/main/module.xml
-13
View File
@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module xmlns="urn:jboss:module:1.3" name="org.mongodb.mongo-java-driver">
<resources>
<artifact name="${org.mongodb:mongo-java-driver}"/>
</resources>
<dependencies>
<module name="javax.api"/>
</dependencies>
</module>
distribution/pom.xml
+3 -3
View File
@@ -17,10 +17,10 @@
<modules>
<module>adapters</module>
<module>saml-adapters</module>
<module>demo-dist</module>
<module>docs-dist</module>
<!--<module>demo-dist</module>-->
<!--<module>docs-dist</module>-->
<module>examples-dist</module>
<module>proxy-dist</module>
<!--<module>proxy-dist</module>-->
<module>server-dist</module>
<module>server-overlay</module>
<module>src-dist</module>
distribution/saml-adapters/as7-eap6-adapter/pom.xml
+1 -1
View File
@@ -15,7 +15,7 @@
<modules>
<module>as7-modules</module>
<module>as7-adapter-zip</module>
<!--<module>as7-adapter-zip</module>-->
<module>eap6-adapter-zip</module>
</modules>
</project>
distribution/saml-adapters/pom.xml
+5 -5
View File
@@ -16,13 +16,13 @@
<modules>
<module>wildfly-adapter</module>
<module>tomcat6-adapter-zip</module>
<module>tomcat7-adapter-zip</module>
<module>tomcat8-adapter-zip</module>
<module>jetty81-adapter-zip</module>
<!--<module>tomcat6-adapter-zip</module>-->
<!--<module>tomcat7-adapter-zip</module>-->
<!--<module>tomcat8-adapter-zip</module>-->
<!--<module>jetty81-adapter-zip</module>-->
<!-- jetty 9.1 doesn't work right now
<module>jetty91-adapter-zip</module> -->
<module>jetty92-adapter-zip</module>
<!--<module>jetty92-adapter-zip</module>-->
<module>as7-eap6-adapter</module>
</modules>
</project>
distribution/server-overlay/pom.xml
+1 -1
View File
@@ -16,6 +16,6 @@
<modules>
<module>wildfly</module>
<module>eap6</module>
<!--<module>eap6</module>-->
</modules>
</project>
forms/account-api/pom.xml
+2 -2
View File
@@ -30,8 +30,8 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>jaxrs-api</artifactId>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
forms/common-themes/pom.xml
+2 -2
View File
@@ -30,8 +30,8 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>jaxrs-api</artifactId>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
forms/login-api/pom.xml
+2 -2
View File
@@ -25,8 +25,8 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>jaxrs-api</artifactId>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
integration/admin-client/pom.xml
+2 -3
View File
@@ -30,9 +30,8 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>jaxrs-api</artifactId>
<version>${resteasy.latest.version}</version>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
integration/as7-eap6/as7-adapter-spi/pom.xml
+2 -2
View File
@@ -2,10 +2,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>keycloak-parent</artifactId>
<artifactId>keycloak-as7-integration-pom</artifactId>
<groupId>org.keycloak</groupId>
<version>1.8.0.CR2</version>
<relativePath>../../../pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
integration/as7-eap6/as7-adapter/pom.xml
+2 -2
View File
@@ -2,10 +2,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>keycloak-parent</artifactId>
<artifactId>keycloak-as7-integration-pom</artifactId>
<groupId>org.keycloak</groupId>
<version>1.8.0.CR2</version>
<relativePath>../../../pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
integration/as7-eap6/as7-subsystem/pom.xml
+2 -4
View File
@@ -19,9 +19,9 @@
<parent>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-parent</artifactId>
<artifactId>keycloak-as7-integration-pom</artifactId>
<version>1.8.0.CR2</version>
<relativePath>../../../pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>keycloak-as7-subsystem</artifactId>
@@ -87,7 +87,6 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>3.1.0.GA</version>
</dependency>
<dependency>
@@ -103,7 +102,6 @@ projects that depend on this project.-->
<dependency>
<groupId>org.jboss.msc</groupId>
<artifactId>jboss-msc</artifactId>
<version>1.0.2.GA</version>
</dependency>
<dependency>
integration/as7-eap6/pom.xml
+13 -1
View File
@@ -13,9 +13,21 @@
<artifactId>keycloak-as7-integration-pom</artifactId>
<packaging>pom</packaging>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.bom</groupId>
<artifactId>eap6-supported-artifacts</artifactId>
<version>${jboss.eap6.bom.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<modules>
<module>as7-adapter-spi</module>
<module>as7-adapter</module>
<module>as7-subsystem</module>
</modules>
</project>
</project>
integration/jaxrs-oauth-client/pom.xml
+2 -3
View File
@@ -15,9 +15,8 @@
<dependencies>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>jaxrs-api</artifactId>
<version>${resteasy.latest.version}</version>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
integration/jetty/pom.xml
+2 -2
View File
@@ -17,7 +17,7 @@
<module>jetty-adapter-spi</module>
<module>jetty-core</module>
<module>jetty8.1</module>
<module>jetty9.2</module>
<module>jetty9.1</module>
<!--<module>jetty9.2</module>-->
<!--<module>jetty9.1</module>-->
</modules>
</project>
integration/pom.xml
+2 -2
View File
@@ -31,7 +31,7 @@
<module>installed</module>
<module>admin-client</module>
<module>osgi-adapter</module>
<module>spring-boot</module>
<module>spring-security</module>
<!--<module>spring-boot</module>-->
<!--<module>spring-security</module>-->
</modules>
</project>
integration/tomcat/pom.xml
+15 -3
View File
@@ -13,11 +13,23 @@
<artifactId>keycloak-tomcat-integration-pom</artifactId>
<packaging>pom</packaging>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.bom</groupId>
<artifactId>eap6-supported-artifacts</artifactId>
<version>${jboss.eap6.bom.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<modules>
<module>tomcat-adapter-spi</module>
<module>tomcat-core</module>
<module>tomcat6</module>
<module>tomcat7</module>
<module>tomcat8</module>
<!--<module>tomcat6</module>-->
<!--<module>tomcat7</module>-->
<!--<module>tomcat8</module>-->
</modules>
</project>
integration/tomcat/tomcat-adapter-spi/pom.xml
+8 -5
View File
@@ -2,10 +2,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>keycloak-parent</artifactId>
<artifactId>keycloak-tomcat-integration-pom</artifactId>
<groupId>org.keycloak</groupId>
<version>1.8.0.CR2</version>
<relativePath>../../../pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -41,11 +41,14 @@
</dependency>
-->
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
<version>${tomcat.version}</version>
<groupId>org.jboss.web</groupId>
<artifactId>jbossweb</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
integration/tomcat/tomcat-core/pom.xml
+8 -17
View File
@@ -2,18 +2,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>keycloak-parent</artifactId>
<artifactId>keycloak-tomcat-integration-pom</artifactId>
<groupId>org.keycloak</groupId>
<version>1.8.0.CR2</version>
<relativePath>../../../pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>keycloak-tomcat-core-adapter</artifactId>
<name>Keycloak Tomcat Core Integration</name>
<properties>
<!-- <tomcat.version>8.0.14</tomcat.version> -->
<!-- <tomcat.version>7.0.52</tomcat.version> -->
<tomcat.version>6.0.41</tomcat.version>
</properties>
<description />
@@ -22,7 +20,6 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>${jboss.logging.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
@@ -60,21 +57,15 @@
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId>
</dependency>
<!--
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
<version>${tomcat.version}</version>
<groupId>org.jboss.web</groupId>
<artifactId>jbossweb</artifactId>
<scope>compile</scope>
</dependency>
-->
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
<version>${tomcat.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
integration/tomcat/tomcat6/pom.xml
+2 -2
View File
@@ -2,10 +2,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>keycloak-parent</artifactId>
<artifactId>keycloak-tomcat-integration-pom</artifactId>
<groupId>org.keycloak</groupId>
<version>1.8.0.CR2</version>
<relativePath>../../../pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
integration/tomcat/tomcat7/pom.xml
+2 -2
View File
@@ -2,10 +2,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>keycloak-parent</artifactId>
<artifactId>keycloak-tomcat-integration-pom</artifactId>
<groupId>org.keycloak</groupId>
<version>1.8.0.CR2</version>
<relativePath>../../../pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
integration/tomcat/tomcat8/pom.xml
+2 -2
View File
@@ -2,10 +2,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>keycloak-parent</artifactId>
<artifactId>keycloak-tomcat-integration-pom</artifactId>
<groupId>org.keycloak</groupId>
<version>1.8.0.CR2</version>
<relativePath>../../../pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
integration/wildfly/pom.xml
+2 -2
View File
@@ -15,7 +15,7 @@
<modules>
<module>wildfly-adapter</module>
<module>wf8-subsystem</module>
<!--<module>wf8-subsystem</module>-->
<module>wildfly-subsystem</module>
</modules>
</project>
</project>
integration/wildfly/wf8-subsystem/pom.xml
+1 -1
View File
@@ -70,7 +70,7 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<groupId>org.jboss.eap</groupId>
<artifactId>wildfly-web-common</artifactId>
<version>${wildfly.version}</version>
<scope>provided</scope>
integration/wildfly/wildfly-subsystem/pom.xml
+1 -1
View File
@@ -63,7 +63,7 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<groupId>org.jboss.eap</groupId>
<artifactId>wildfly-web-common</artifactId>
<scope>provided</scope>
</dependency>
pom.xml
+85 -206
View File
@@ -1,11 +1,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss</groupId>
<artifactId>jboss-parent</artifactId>
<version>19</version>
<version>19.0.0.redhat-2</version>
</parent>
<name>Keycloak</name>
@@ -18,66 +18,71 @@
<packaging>pom</packaging>
<properties>
<product.name>Keycloak</product.name>
<product.name-html>\u003Cstrong\u003EKeycloak\u003C\u002Fstrong\u003E</product.name-html>
<product.version>${project.version}</product.version>
<product.name>RH-SSO</product.name>
<product.name-html>\u003Cstrong\u003ERed Hat\u003C\u002Fstrong\u003E\u003Csup\u003E\u00AE\u003C\u002Fsup\u003E Single Sign On</product.name-html>
<product.version>7.0.0.ER1-redhat-1</product.version>
<product.build-time>${timestamp}</product.build-time>
<apacheds.version>2.0.0-M17</apacheds.version>
<apacheds.codec.version>1.0.0-M23</apacheds.codec.version>
<org.apache.james.apache-mime4j.version>0.6</org.apache.james.apache-mime4j.version>
<bouncycastle.crypto.version>1.50</bouncycastle.crypto.version>
<jackson.version>1.9.9</jackson.version>
<apache.httpcomponents.version>4.3.6</apache.httpcomponents.version>
<apache.httpcomponents.httpcore.version>4.3.3</apache.httpcomponents.httpcore.version>
<resteasy.version>2.3.7.Final</resteasy.version>
<resteasy.latest.version>3.0.9.Final</resteasy.latest.version>
<!-- Mime4j version has to be in sync with version in eap-runtime-artifacts bom -->
<org.apache.james.apache-mime4j.version>0.6.0.redhat-5</org.apache.james.apache-mime4j.version>
<!-- Bouncycastle, Jakson and httpcomponents versions have to be in sync with versions in eap-runtime-artifacts bom -->
<bouncycastle.crypto.version>1.52.0.redhat-2</bouncycastle.crypto.version>
<jackson.version>1.9.13.redhat-2</jackson.version>
<apache.httpcomponents.version>4.5.0.redhat-1</apache.httpcomponents.version>
<!--<apache.httpcomponents.httpcore.version>4.3.3</apache.httpcomponents.httpcore.version>-->
<!-- resteasy version has to be aligned with version in eap-runtime-artifacts bom version -->
<resteasy.version>3.0.14.Final-redhat-1</resteasy.version>
<resteasy.latest.version>${resteasy.version}</resteasy.latest.version>
<keycloak.apache.httpcomponents.version>4.2.1</keycloak.apache.httpcomponents.version>
<undertow.version>1.1.1.Final</undertow.version>
<picketlink.version>2.7.0.Final</picketlink.version>
<mongo.driver.version>3.2.0</mongo.driver.version>
<jboss.logging.version>3.1.4.GA</jboss.logging.version>
<!-- jboss.logging version has to be in sync with eap-runtime-artifacts bom -->
<jboss.logging.version>3.3.0.Final-redhat-1</jboss.logging.version>
<syslog4j.version>0.9.30</syslog4j.version>
<jboss-logging-tools.version>1.2.0.Beta1</jboss-logging-tools.version>
<jboss.spec.javax.xml.bind.jboss-jaxb-api_2.2_spec.version>1.0.4.Final</jboss.spec.javax.xml.bind.jboss-jaxb-api_2.2_spec.version>
<hibernate.javax.persistence.version>1.0.0.Final</hibernate.javax.persistence.version>
<jboss-logging-tools.version>1.2.0.Final</jboss-logging-tools.version>
<hibernate.javax.persistence.version>1.0.0.Final-redhat-1</hibernate.javax.persistence.version>
<hibernate.javax.persistence.artifactId>hibernate-jpa-2.1-api</hibernate.javax.persistence.artifactId>
<hibernate.entitymanager.version>4.3.10.Final</hibernate.entitymanager.version>
<hibernate.entitymanager.version>5.0.6.Final-redhat-1</hibernate.entitymanager.version>
<!--<hibernate.commons-annotations.version>4.0.5.Final</hibernate.commons-annotations.version>-->
<h2.version>1.4.187</h2.version>
<mysql.version>5.1.29</mysql.version>
<postgresql.version>9.3-1100-jdbc41</postgresql.version>
<dom4j.version>1.6.1</dom4j.version>
<xml-apis.version>1.4.01</xml-apis.version>
<slf4j.version>1.7.7</slf4j.version>
<wildfly.version>10.0.0.CR5</wildfly.version>
<wildfly.core.version>2.0.5.Final</wildfly.core.version>
<slf4j.version>1.7.7.redhat-2</slf4j.version>
<!-- logging version has to be aligned with version in eap-runtime-artifacts bom version -->
<wildfly.version>7.0.0.ER4-redhat-1</wildfly.version>
<wildfly.core.version>2.0.6.Final-redhat-1</wildfly.core.version>
<wildfly.build-tools.version>1.1.0.Final</wildfly.build-tools.version>
<!-- this is EAP 6.4 alpha, publicly available -->
<jboss.version>7.5.0.Final-redhat-15</jboss.version>
<!-- this is EAP 6.4.5 -->
<jboss.version>7.5.5.Final-redhat-3</jboss.version>
<jboss.eap6.bom.version>6.4.5.GA</jboss.eap6.bom.version>
<servlet.api.30.version>1.0.2.Final</servlet.api.30.version>
<google.zxing.version>3.2.1</google.zxing.version>
<github.relaxng.version>2011.1</github.relaxng.version>
<freemarker.version>2.3.23</freemarker.version>
<twitter4j.version>4.0.4</twitter4j.version>
<!-- servlet.api.30 versions have to be in sync with version in eap6-supported-artifacts bom -->
<servlet.api.30.version>1.0.2.Final-redhat-2</servlet.api.30.version>
<google.zxing.version>3.2.1.redhat-2</google.zxing.version>
<freemarker.version>2.3.23.redhat-1</freemarker.version>
<twitter4j.version>4.0.4.redhat-1</twitter4j.version>
<selenium.version>2.35.0</selenium.version>
<sun.istack.version>2.21</sun.istack.version>
<sun.jaxb.version>2.2.11</sun.jaxb.version>
<sun.xsom.version>20140925</sun.xsom.version>
<javax.mail.version>1.4.5</javax.mail.version>
<infinispan.version>8.1.0.Final</infinispan.version>
<liquibase.version>3.4.1</liquibase.version>
<javax.mail.version>1.4.5.redhat-2</javax.mail.version>
<!-- infinispan version has to be aligned with version in eap-runtime-artifacts bom version -->
<infinispan.version>8.1.0.Final-redhat-1</infinispan.version>
<liquibase.version>3.4.1.redhat-1</liquibase.version>
<!-- Jetty and osgi version are synced with Fuse 6.2 -->
<jetty9.version>9.1.0.v20131115</jetty9.version>
<osgi.version>4.2.0</osgi.version>
<osgi.version>5.0.0</osgi.version>
<pax.web.version>3.1.2</pax.web.version>
<jmeter.version>2.10</jmeter.version>
<junit.version>4.12</junit.version>
<hamcrest.version>1.3</hamcrest.version>
<log4j.version>1.2.17</log4j.version>
<greenmail.version>1.3.1b</greenmail.version>
<xmlsec.version>1.5.1</xmlsec.version>
<aesh.version>0.65.1</aesh.version>
<!-- xmlsec version has to be in sync with version in eap-runtime-artifacts bom -->
<xmlsec.version>2.0.5.redhat-1</xmlsec.version>
<commons.logging.version>1.1.1-redhat-2</commons.logging.version>
<enforcer.plugin.version>1.4</enforcer.plugin.version>
<jboss.as.plugin.version>7.5.Final</jboss.as.plugin.version>
@@ -143,7 +148,6 @@
<module>events</module>
<module>model</module>
<module>integration</module>
<module>proxy</module>
<module>federation</module>
<module>services</module>
<module>saml</module>
@@ -161,81 +165,17 @@
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.github.relaxng</groupId>
<artifactId>relaxngDatatype</artifactId>
<version>${github.relaxng.version}</version>
</dependency>
<dependency>
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-runtime</artifactId>
<version>${sun.istack.version}</version>
</dependency>
<dependency>
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-tools</artifactId>
<version>${sun.istack.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind.external</groupId>
<artifactId>rngom</artifactId>
<version>${sun.jaxb.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xsom</groupId>
<artifactId>xsom</artifactId>
<version>${sun.xsom.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>${bouncycastle.crypto.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>${bouncycastle.crypto.version}</version>
<groupId>org.jboss.bom</groupId>
<artifactId>eap-runtime-artifacts</artifactId>
<version>7.0.0.ER4</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>${javax.mail.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>jaxrs-api</artifactId>
<version>${resteasy.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<version>${resteasy.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-multipart-provider</artifactId>
<version>${resteasy.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson-provider</artifactId>
<version>${resteasy.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
<version>${resteasy.latest.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-undertow</artifactId>
<version>${resteasy.latest.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.xml.bind</groupId>
<artifactId>jboss-jaxb-api_2.2_spec</artifactId>
<version>${jboss.spec.javax.xml.bind.jboss-jaxb-api_2.2_spec.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-wildfly-adapter-subsystem</artifactId>
@@ -251,26 +191,6 @@
<artifactId>undertow-core</artifactId>
<version>${undertow.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
@@ -282,6 +202,18 @@
<version>${picketlink.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation</artifactId>
<version>${picketlink.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-config</artifactId>
<version>${picketlink.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
@@ -296,6 +228,7 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -309,22 +242,12 @@
<version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>${hibernate.javax.persistence.artifactId}</artifactId>
<version>${hibernate.javax.persistence.version}</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>${hibernate.entitymanager.version}</version>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
@@ -335,18 +258,27 @@
<artifactId>xmlsec</artifactId>
<version>${xmlsec.version}</version>
<exclusions>
<exclusion>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<groupId>org.jboss.eap</groupId>
<artifactId>wildfly-dist</artifactId>
<version>${wildfly.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons.logging.version}</version>
</dependency>
<!-- Twitter -->
<dependency>
@@ -421,12 +353,6 @@
<version>${jmeter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>${dom4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
@@ -434,11 +360,6 @@
<scope>test</scope>
</dependency>
<!-- Older 1.5.10 binding required by embedded ApacheDS -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
@@ -452,16 +373,16 @@
<version>${mysql.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${apache.httpcomponents.version}</version>
</dependency>
<dependency>
<!--<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${apache.httpcomponents.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>${apache.httpcomponents.httpcore.version}</version>
</dependency>
</dependency>-->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
@@ -485,22 +406,7 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-controller</artifactId>
<version>${wildfly.core.version}</version>
</dependency>
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-server</artifactId>
<version>${wildfly.core.version}</version>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-ee</artifactId>
<version>${wildfly.version}</version>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<groupId>org.jboss.eap</groupId>
<artifactId>wildfly-feature-pack</artifactId>
<version>${wildfly.version}</version>
<type>zip</type>
@@ -518,51 +424,29 @@
<type>pom</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-undertow</artifactId>
<version>${wildfly.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-subsystem-test-framework</artifactId>
<version>${wildfly.core.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-core-feature-pack</artifactId>
<type>pom</type>
<version>${wildfly.core.version}</version>
</dependency>
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-core-feature-pack</artifactId>
<type>zip</type>
<version>${wildfly.core.version}</version>
</dependency>
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-version</artifactId>
<version>${wildfly.core.version}</version>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-web-common</artifactId>
<version>${wildfly.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
<version>${jboss-logging-tools.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>
<version>${infinispan.version}</version>
</dependency>
<!--<dependency>-->
<!--<groupId>org.infinispan</groupId>-->
<!--<artifactId>infinispan-core</artifactId>-->
<!--<version>${infinispan.version}</version>-->
<!--</dependency>-->
<dependency>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>
@@ -583,11 +467,6 @@
<artifactId>pax-web-runtime</artifactId>
<version>${pax.web.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.aesh</groupId>
<artifactId>aesh</artifactId>
<version>${aesh.version}</version>
</dependency>
<!-- keycloak -->
<dependency>
saml/client-adapter/as7-eap6/adapter/pom.xml
+2 -2
View File
@@ -2,10 +2,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>keycloak-parent</artifactId>
<artifactId>keycloak-saml-eap-integration-pom</artifactId>
<groupId>org.keycloak</groupId>
<version>1.8.0.CR2</version>
<relativePath>../../../../pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
saml/client-adapter/as7-eap6/pom.xml
+12
View File
@@ -13,6 +13,18 @@
<artifactId>keycloak-saml-eap-integration-pom</artifactId>
<packaging>pom</packaging>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.bom</groupId>
<artifactId>eap6-supported-artifacts</artifactId>
<version>${jboss.eap6.bom.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<modules>
<module>adapter</module>
<module>subsystem</module>
saml/client-adapter/as7-eap6/subsystem/pom.xml
+2 -4
View File
@@ -19,9 +19,9 @@
<parent>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-parent</artifactId>
<artifactId>keycloak-saml-eap-integration-pom</artifactId>
<version>1.8.0.CR2</version>
<relativePath>../../../../pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>keycloak-saml-as7-subsystem</artifactId>
@@ -87,7 +87,6 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>3.1.0.GA</version>
</dependency>
<dependency>
@@ -103,7 +102,6 @@ projects that depend on this project.-->
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-controller</artifactId>
<version>${jboss.version}</version>
</dependency>
<dependency>
saml/client-adapter/pom.xml
+1 -1
View File
@@ -17,7 +17,7 @@
<module>core</module>
<module>undertow</module>
<module>tomcat</module>
<module>jetty</module>
<!--<module>jetty</module>-->
<module>wildfly</module>
<module>as7-eap6</module>
<module>servlet-filter</module>
saml/client-adapter/tomcat/pom.xml
+15 -3
View File
@@ -13,10 +13,22 @@
<artifactId>keycloak-saml-tomcat-integration-pom</artifactId>
<packaging>pom</packaging>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.bom</groupId>
<artifactId>eap6-supported-artifacts</artifactId>
<version>${jboss.eap6.bom.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<modules>
<module>tomcat-core</module>
<module>tomcat6</module>
<module>tomcat7</module>
<module>tomcat8</module>
<!--<module>tomcat6</module>-->
<!--<module>tomcat7</module>-->
<!--<module>tomcat8</module>-->
</modules>
</project>
saml/client-adapter/tomcat/tomcat-core/pom.xml
+8 -5
View File
@@ -2,10 +2,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>keycloak-parent</artifactId>
<artifactId>keycloak-saml-tomcat-integration-pom</artifactId>
<groupId>org.keycloak</groupId>
<version>1.8.0.CR2</version>
<relativePath>../../../../pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -61,11 +61,14 @@
</dependency>
-->
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
<version>${tomcat.version}</version>
<groupId>org.jboss.web</groupId>
<artifactId>jbossweb</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
saml/client-adapter/tomcat/tomcat6/pom.xml
+2 -2
View File
@@ -2,10 +2,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>keycloak-parent</artifactId>
<artifactId>keycloak-saml-tomcat-integration-pom</artifactId>
<groupId>org.keycloak</groupId>
<version>1.8.0.CR2</version>
<relativePath>../../../../pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
saml/client-adapter/tomcat/tomcat7/pom.xml
+2 -2
View File
@@ -2,10 +2,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>keycloak-parent</artifactId>
<artifactId>keycloak-saml-tomcat-integration-pom</artifactId>
<groupId>org.keycloak</groupId>
<version>1.8.0.CR2</version>
<relativePath>../../../../pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
saml/client-adapter/tomcat/tomcat8/pom.xml
+2 -2
View File
@@ -2,10 +2,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>keycloak-parent</artifactId>
<artifactId>keycloak-saml-tomcat-integration-pom</artifactId>
<groupId>org.keycloak</groupId>
<version>1.8.0.CR2</version>
<relativePath>../../../../pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
saml/client-adapter/wildfly/wildfly-subsystem/pom.xml
+1 -1
View File
@@ -63,7 +63,7 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<groupId>org.jboss.eap</groupId>
<artifactId>wildfly-web-common</artifactId>
<scope>provided</scope>
</dependency>
saml/saml-protocol/pom.xml
+2 -2
View File
@@ -98,8 +98,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>jaxrs-api</artifactId>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
services/pom.xml
+3 -2
View File
@@ -114,8 +114,9 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>jaxrs-api</artifactId>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
testsuite/integration-arquillian/tests/adapters/wildfly/pom.xml
+2 -3
View File
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.keycloak.testsuite</groupId>
<artifactId>integration-arquillian-tests-adapters</artifactId>
@@ -18,7 +17,7 @@
<dependencies>
<dependency>
<groupId>org.wildfly</groupId>
<groupId>org.jboss.eap</groupId>
<artifactId>wildfly-dist</artifactId>
<type>zip</type>
</dependency>
testsuite/integration-arquillian/tests/adapters/wildfly8/pom.xml
+2 -3
View File
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.keycloak.testsuite</groupId>
<artifactId>integration-arquillian-tests-adapters</artifactId>
@@ -20,7 +19,7 @@
<dependencies>
<dependency>
<groupId>org.wildfly</groupId>
<groupId>org.jboss.eap</groupId>
<artifactId>wildfly-dist</artifactId>
<type>zip</type>
</dependency>
testsuite/integration-arquillian/tests/pom.xml
+23 -1
View File
@@ -68,7 +68,27 @@
<groupId>org.wildfly</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
<version>${arquillian-wildfly-container.version}</version>
</dependency>
</dependency>
<dependency>
<groupId>org.jboss.xnio</groupId>
<artifactId>xnio-api</artifactId>
<version>3.3.0.Final</version>
</dependency>
<dependency>
<groupId>org.jboss.xnio</groupId>
<artifactId>xnio-nio</artifactId>
<version>3.3.0.Final</version>
</dependency>
<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-servlet</artifactId>
<version>${undertow.version}</version>
</dependency>
<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-core</artifactId>
<version>${undertow.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -313,11 +333,13 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
<version>${resteasy.latest.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-undertow</artifactId>
<scope>compile</scope>
<version>${resteasy.latest.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
testsuite/integration/pom.xml
+27 -4
View File
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>keycloak-testsuite-pom</artifactId>
<groupId>org.keycloak</groupId>
@@ -11,7 +10,22 @@
<artifactId>keycloak-testsuite-integration</artifactId>
<name>Keycloak Integration TestSuite</name>
<description />
<description/>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.xnio</groupId>
<artifactId>xnio-api</artifactId>
<version>3.3.0.Final</version>
</dependency>
<dependency>
<groupId>org.jboss.xnio</groupId>
<artifactId>xnio-nio</artifactId>
<version>3.3.0.Final</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
@@ -46,14 +60,18 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>jaxrs-api</artifactId>
<version>3.0.10.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>async-http-servlet-3.0</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
@@ -72,18 +90,23 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-undertow</artifactId>
<version>3.0.14.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-multipart-provider</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson-provider</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.zxing</groupId>
@@ -212,7 +235,7 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<groupId>org.jboss.eap</groupId>
<artifactId>wildfly-undertow</artifactId>
<scope>test</scope>
</dependency>
testsuite/jetty/jetty81/pom.xml
+3 -4
View File
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>keycloak-testsuite-pom</artifactId>
<groupId>org.keycloak</groupId>
@@ -14,7 +13,7 @@
<properties>
<jetty9.version>8.1.17.v20150415</jetty9.version>
</properties>
<description />
<description/>
<dependencies>
<dependency>
@@ -185,7 +184,7 @@
<artifactId>selenium-chrome-driver</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<groupId>org.jboss.eap</groupId>
<artifactId>wildfly-undertow</artifactId>
<version>${wildfly.version}</version>
<scope>test</scope>
testsuite/jetty/jetty91/pom.xml
+3 -4
View File
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>keycloak-testsuite-pom</artifactId>
<groupId>org.keycloak</groupId>
@@ -14,7 +13,7 @@
<properties>
<jetty9.version>9.1.5.v20140505</jetty9.version>
</properties>
<description />
<description/>
<dependencies>
<dependency>
@@ -185,7 +184,7 @@
<artifactId>selenium-chrome-driver</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<groupId>org.jboss.eap</groupId>
<artifactId>wildfly-undertow</artifactId>
<version>${wildfly.version}</version>
<scope>test</scope>
testsuite/jetty/jetty92/pom.xml
+3 -4
View File
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>keycloak-testsuite-pom</artifactId>
<groupId>org.keycloak</groupId>
@@ -14,7 +13,7 @@
<properties>
<jetty9.version>9.2.4.v20141103</jetty9.version>
</properties>
<description />
<description/>
<dependencies>
<dependency>
@@ -185,7 +184,7 @@
<artifactId>selenium-chrome-driver</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<groupId>org.jboss.eap</groupId>
<artifactId>wildfly-undertow</artifactId>
<version>${wildfly.version}</version>
<scope>test</scope>
testsuite/pom.xml
+6 -6
View File
@@ -65,12 +65,12 @@
</build>
<modules>
<module>integration</module>
<module>proxy</module>
<module>tomcat6</module>
<module>tomcat7</module>
<module>tomcat8</module>
<module>jetty</module>
<module>performance</module>
<!--<module>proxy</module>-->
<!--<module>tomcat6</module>-->
<!--<module>tomcat7</module>-->
<!--<module>tomcat8</module>-->
<!--<module>jetty</module>-->
<!--<module>performance</module>-->
<!--<module>docker-cluster</module>-->
</modules>
testsuite/proxy/pom.xml
+3 -4
View File
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>keycloak-testsuite-pom</artifactId>
<groupId>org.keycloak</groupId>
@@ -15,7 +14,7 @@
<!--<tomcat.version>8.0.14</tomcat.version>-->
<tomcat.version>7.0.54</tomcat.version>
</properties>
<description />
<description/>
<dependencies>
<dependency>
@@ -176,7 +175,7 @@
<artifactId>selenium-chrome-driver</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<groupId>org.jboss.eap</groupId>
<artifactId>wildfly-undertow</artifactId>
<version>${wildfly.version}</version>
<scope>test</scope>
testsuite/wildfly/pom.xml
+3 -4
View File
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>keycloak-testsuite-pom</artifactId>
<groupId>org.keycloak</groupId>
@@ -11,7 +10,7 @@
<artifactId>keycloak-testsuite-wildfly</artifactId>
<name>Keycloak WildFly 9.x Integration TestSuite</name>
<description />
<description/>
<dependencies>
<dependency>
@@ -178,7 +177,7 @@
<artifactId>selenium-chrome-driver</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<groupId>org.jboss.eap</groupId>
<artifactId>wildfly-undertow</artifactId>
<version>${wildfly.version}</version>
<scope>test</scope>
wildfly/adduser/pom.xml
-1
View File
@@ -44,7 +44,6 @@
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-domain-management</artifactId>
<version>${wildfly.core.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.aesh</groupId>
wildfly/pom.xml
+1 -1
View File
@@ -17,6 +17,6 @@
<module>adduser</module>
<module>extensions</module>
<module>server-subsystem</module>
<module>server-eap6-subsystem</module>
<!--<module>server-eap6-subsystem</module>-->
</modules>
</project>
wildfly/server-eap6-subsystem/pom.xml
-1
View File
@@ -92,7 +92,6 @@
<dependency>
<groupId>org.jboss.msc</groupId>
<artifactId>jboss-msc</artifactId>
<version>1.0.2.GA</version>
</dependency>
<dependency>
<groupId>junit</groupId>
wildfly/server-subsystem/pom.xml
+1 -1
View File
@@ -62,7 +62,7 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<groupId>org.jboss.eap</groupId>
<artifactId>wildfly-web-common</artifactId>
<scope>provided</scope>
</dependency>