keycloak-aplcache
Changes
adapters/oidc/as7-eap6/pom.xml 14(+13 -1)
adapters/oidc/jetty/pom.xml 4(+2 -2)
adapters/oidc/pom.xml 2(+0 -2)
adapters/oidc/tomcat/pom.xml 18(+15 -3)
adapters/oidc/tomcat/tomcat-core/pom.xml 21(+6 -15)
adapters/oidc/wildfly/pom.xml 4(+2 -2)
adapters/saml/as7-eap6/pom.xml 12(+12 -0)
adapters/saml/pom.xml 2(+1 -1)
adapters/saml/tomcat/pom.xml 18(+15 -3)
adapters/spi/tomcat-adapter-spi/pom.xml 21(+18 -3)
dependencies/server-all/pom.xml 4(+2 -2)
distribution/adapters/pom.xml 14(+7 -7)
distribution/feature-packs/pom.xml 2(+1 -1)
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/jboss/as/product/rh-sso/dir/META-INF/MANIFEST.MF 2(+1 -1)
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/jboss/as/product/rh-sso/module.xml 2(+1 -1)
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-model-mongo/main/module.xml 39(+0 -39)
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml 2(+1 -1)
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-services/main/module.xml 2(+1 -1)
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/mongodb/mongo-java-driver/main/module.xml 30(+0 -30)
distribution/pom.xml 6(+3 -3)
distribution/saml-adapters/pom.xml 10(+5 -5)
model/infinispan/pom.xml 4(+4 -0)
model/jpa/pom.xml 4(+4 -0)
model/pom.xml 2(+1 -1)
pom.xml 280(+62 -218)
services/pom.xml 4(+4 -0)
testsuite/integration/pom.xml 19(+17 -2)
testsuite/jetty/jetty81/pom.xml 4(+2 -2)
testsuite/jetty/jetty91/pom.xml 4(+2 -2)
testsuite/jetty/jetty92/pom.xml 4(+2 -2)
testsuite/pom.xml 7(+0 -7)
testsuite/proxy/pom.xml 4(+2 -2)
testsuite/wildfly/pom.xml 4(+2 -2)
wildfly/adduser/pom.xml 1(+0 -1)
wildfly/server-subsystem/pom.xml 2(+1 -1)
Details
diff --git a/adapters/oidc/as7-eap6/as7-subsystem/pom.xml b/adapters/oidc/as7-eap6/as7-subsystem/pom.xml
index 845101e..8feda3e 100755
--- a/adapters/oidc/as7-eap6/as7-subsystem/pom.xml
+++ b/adapters/oidc/as7-eap6/as7-subsystem/pom.xml
@@ -88,7 +88,6 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
- <version>3.1.0.GA</version>
</dependency>
<dependency>
@@ -104,7 +103,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>
adapters/oidc/as7-eap6/pom.xml 14(+13 -1)
diff --git a/adapters/oidc/as7-eap6/pom.xml b/adapters/oidc/as7-eap6/pom.xml
index 78ece03..33e02b9 100755
--- a/adapters/oidc/as7-eap6/pom.xml
+++ b/adapters/oidc/as7-eap6/pom.xml
@@ -30,9 +30,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>
\ No newline at end of file
+</project>
adapters/oidc/jetty/pom.xml 4(+2 -2)
diff --git a/adapters/oidc/jetty/pom.xml b/adapters/oidc/jetty/pom.xml
index d4e988f..6ffe8f8 100755
--- a/adapters/oidc/jetty/pom.xml
+++ b/adapters/oidc/jetty/pom.xml
@@ -33,7 +33,7 @@
<modules>
<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>
adapters/oidc/pom.xml 2(+0 -2)
diff --git a/adapters/oidc/pom.xml b/adapters/oidc/pom.xml
index 7fb9eb7..fc1f22e 100755
--- a/adapters/oidc/pom.xml
+++ b/adapters/oidc/pom.xml
@@ -40,8 +40,6 @@
<module>osgi-adapter</module>
<module>servlet-filter</module>
<module>servlet-oauth-client</module>
- <module>spring-boot</module>
- <module>spring-security</module>
<module>tomcat</module>
<module>undertow</module>
<module>wildfly</module>
adapters/oidc/tomcat/pom.xml 18(+15 -3)
diff --git a/adapters/oidc/tomcat/pom.xml b/adapters/oidc/tomcat/pom.xml
index 753070c..eae9895 100755
--- a/adapters/oidc/tomcat/pom.xml
+++ b/adapters/oidc/tomcat/pom.xml
@@ -30,10 +30,22 @@
<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-core</module>
- <module>tomcat6</module>
- <module>tomcat7</module>
- <module>tomcat8</module>
+ <!--<module>tomcat6</module>-->
+ <!--<module>tomcat7</module>-->
+ <!--<module>tomcat8</module>-->
</modules>
</project>
adapters/oidc/tomcat/tomcat-core/pom.xml 21(+6 -15)
diff --git a/adapters/oidc/tomcat/tomcat-core/pom.xml b/adapters/oidc/tomcat/tomcat-core/pom.xml
index c3fd9e6..31f4adb 100755
--- a/adapters/oidc/tomcat/tomcat-core/pom.xml
+++ b/adapters/oidc/tomcat/tomcat-core/pom.xml
@@ -29,8 +29,6 @@
<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 />
@@ -39,7 +37,6 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
- <version>${jboss.logging.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
@@ -77,21 +74,15 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</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>
adapters/oidc/wildfly/pom.xml 4(+2 -2)
diff --git a/adapters/oidc/wildfly/pom.xml b/adapters/oidc/wildfly/pom.xml
index e3b365c..ae51297 100755
--- a/adapters/oidc/wildfly/pom.xml
+++ b/adapters/oidc/wildfly/pom.xml
@@ -32,7 +32,7 @@
<modules>
<module>wildfly-adapter</module>
- <module>wf8-subsystem</module>
+ <!--<module>wf8-subsystem</module>-->
<module>wildfly-subsystem</module>
</modules>
-</project>
\ No newline at end of file
+</project>
diff --git a/adapters/oidc/wildfly/wf8-subsystem/pom.xml b/adapters/oidc/wildfly/wf8-subsystem/pom.xml
index 708a9e9..ceb4612 100755
--- a/adapters/oidc/wildfly/wf8-subsystem/pom.xml
+++ b/adapters/oidc/wildfly/wf8-subsystem/pom.xml
@@ -71,7 +71,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>
diff --git a/adapters/oidc/wildfly/wildfly-subsystem/pom.xml b/adapters/oidc/wildfly/wildfly-subsystem/pom.xml
index 89eddfe..fb34fa3 100755
--- a/adapters/oidc/wildfly/wildfly-subsystem/pom.xml
+++ b/adapters/oidc/wildfly/wildfly-subsystem/pom.xml
@@ -64,7 +64,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.wildfly</groupId>
+ <groupId>org.jboss.eap</groupId>
<artifactId>wildfly-web-common</artifactId>
<scope>provided</scope>
</dependency>
adapters/saml/as7-eap6/pom.xml 12(+12 -0)
diff --git a/adapters/saml/as7-eap6/pom.xml b/adapters/saml/as7-eap6/pom.xml
index b45e926..4035a71 100755
--- a/adapters/saml/as7-eap6/pom.xml
+++ b/adapters/saml/as7-eap6/pom.xml
@@ -30,6 +30,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>
diff --git a/adapters/saml/as7-eap6/subsystem/pom.xml b/adapters/saml/as7-eap6/subsystem/pom.xml
index c54c688..9de2a36 100755
--- a/adapters/saml/as7-eap6/subsystem/pom.xml
+++ b/adapters/saml/as7-eap6/subsystem/pom.xml
@@ -88,7 +88,6 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
- <version>3.1.0.GA</version>
</dependency>
<dependency>
adapters/saml/pom.xml 2(+1 -1)
diff --git a/adapters/saml/pom.xml b/adapters/saml/pom.xml
index dc48e1b..970fb3f 100755
--- a/adapters/saml/pom.xml
+++ b/adapters/saml/pom.xml
@@ -34,7 +34,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>
adapters/saml/tomcat/pom.xml 18(+15 -3)
diff --git a/adapters/saml/tomcat/pom.xml b/adapters/saml/tomcat/pom.xml
index a6a070c..d47c9e8 100755
--- a/adapters/saml/tomcat/pom.xml
+++ b/adapters/saml/tomcat/pom.xml
@@ -30,10 +30,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>
diff --git a/adapters/saml/tomcat/tomcat-core/pom.xml b/adapters/saml/tomcat/tomcat-core/pom.xml
index a2c3a61..a864303 100755
--- a/adapters/saml/tomcat/tomcat-core/pom.xml
+++ b/adapters/saml/tomcat/tomcat-core/pom.xml
@@ -78,11 +78,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>
diff --git a/adapters/saml/wildfly/wildfly-subsystem/pom.xml b/adapters/saml/wildfly/wildfly-subsystem/pom.xml
index 61f69b6..77fd44b 100755
--- a/adapters/saml/wildfly/wildfly-subsystem/pom.xml
+++ b/adapters/saml/wildfly/wildfly-subsystem/pom.xml
@@ -64,7 +64,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.wildfly</groupId>
+ <groupId>org.jboss.eap</groupId>
<artifactId>wildfly-web-common</artifactId>
<scope>provided</scope>
</dependency>
adapters/spi/tomcat-adapter-spi/pom.xml 21(+18 -3)
diff --git a/adapters/spi/tomcat-adapter-spi/pom.xml b/adapters/spi/tomcat-adapter-spi/pom.xml
index efae6bd..fc43c83 100755
--- a/adapters/spi/tomcat-adapter-spi/pom.xml
+++ b/adapters/spi/tomcat-adapter-spi/pom.xml
@@ -35,6 +35,18 @@
</properties>
<description />
+ <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>
+
<dependencies>
<dependency>
<groupId>org.jboss.logging</groupId>
@@ -58,11 +70,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>
dependencies/server-all/pom.xml 4(+2 -2)
diff --git a/dependencies/server-all/pom.xml b/dependencies/server-all/pom.xml
index 57a34d6..491614e 100755
--- a/dependencies/server-all/pom.xml
+++ b/dependencies/server-all/pom.xml
@@ -66,14 +66,14 @@
<artifactId>keycloak-saml-core</artifactId>
</dependency>
<!-- mongo -->
- <dependency>
+ <!-- <dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-model-mongo</artifactId>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.liquibase</groupId>
diff --git a/distribution/adapters/as7-eap6-adapter/pom.xml b/distribution/adapters/as7-eap6-adapter/pom.xml
index 1d0bc15..2d2dbdd 100644
--- a/distribution/adapters/as7-eap6-adapter/pom.xml
+++ b/distribution/adapters/as7-eap6-adapter/pom.xml
@@ -30,9 +30,21 @@
<artifactId>keycloak-as7-eap6-adapter-dist-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-modules</module>
- <module>as7-adapter-zip</module>
+ <!--<module>as7-adapter-zip</module>-->
<module>eap6-adapter-zip</module>
</modules>
</project>
distribution/adapters/pom.xml 14(+7 -7)
diff --git a/distribution/adapters/pom.xml b/distribution/adapters/pom.xml
index 9c80f2c..d60791f 100755
--- a/distribution/adapters/pom.xml
+++ b/distribution/adapters/pom.xml
@@ -32,15 +32,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>
diff --git a/distribution/feature-packs/adapter-feature-pack/pom.xml b/distribution/feature-packs/adapter-feature-pack/pom.xml
index 9ff959c..473aa89 100755
--- a/distribution/feature-packs/adapter-feature-pack/pom.xml
+++ b/distribution/feature-packs/adapter-feature-pack/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<!--
~ Copyright 2016 Red Hat, Inc. and/or its affiliates
~ and other contributors as indicated by the @author tags.
@@ -56,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>
@@ -67,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 2(+1 -1)
diff --git a/distribution/feature-packs/pom.xml b/distribution/feature-packs/pom.xml
index 602f508..3355fc4 100644
--- a/distribution/feature-packs/pom.xml
+++ b/distribution/feature-packs/pom.xml
@@ -31,7 +31,7 @@
<packaging>pom</packaging>
<modules>
- <module>adapter-feature-pack</module>
+<!-- <module>adapter-feature-pack</module>-->
<module>server-feature-pack</module>
</modules>
</project>
diff --git a/distribution/feature-packs/server-feature-pack/feature-pack-build.xml b/distribution/feature-packs/server-feature-pack/feature-pack-build.xml
index 8db3dfc..006b5e9 100644
--- a/distribution/feature-packs/server-feature-pack/feature-pack-build.xml
+++ b/distribution/feature-packs/server-feature-pack/feature-pack-build.xml
@@ -17,7 +17,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" />
diff --git a/distribution/feature-packs/server-feature-pack/pom.xml b/distribution/feature-packs/server-feature-pack/pom.xml
index 0ec6cdd..251da1c 100644
--- a/distribution/feature-packs/server-feature-pack/pom.xml
+++ b/distribution/feature-packs/server-feature-pack/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<!--
~ Copyright 2016 Red Hat, Inc. and/or its affiliates
~ and other contributors as indicated by the @author tags.
@@ -48,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>
@@ -59,7 +60,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <executions></executions>
+ <executions/>
</plugin>
<plugin>
<groupId>org.wildfly.build</groupId>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/product.conf b/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/product.conf
index 030791c..55a0a54 100644
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/product.conf
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/product.conf
@@ -1 +1 @@
-slot=keycloak
+slot=rh-sso
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml
index 6f66811..7281444 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml
@@ -26,7 +26,7 @@
<module name="org.keycloak.keycloak-ldap-federation" services="import"/>
<module name="org.keycloak.keycloak-server-spi" services="import"/>
<module name="org.keycloak.keycloak-model-jpa" services="import" meta-inf="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-infinispan" services="import"/>
<module name="org.keycloak.keycloak-services" export="true" services="import"/>
<module name="org.hibernate" services="import"/>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-services/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-services/main/module.xml
index 3356e04..c8bea10 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-services/main/module.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-services/main/module.xml
@@ -36,7 +36,7 @@
<module name="org.keycloak.keycloak-ldap-federation" services="import"/>
<module name="org.keycloak.keycloak-server-spi" 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-infinispan" services="import"/>
<module name="org.keycloak.keycloak-saml-core" services="import"/>
<module name="org.keycloak.keycloak-services" export="true" services="import"/>
distribution/pom.xml 6(+3 -3)
diff --git a/distribution/pom.xml b/distribution/pom.xml
index c6e11eb..6653edd 100755
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -34,10 +34,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>
diff --git a/distribution/saml-adapters/as7-eap6-adapter/pom.xml b/distribution/saml-adapters/as7-eap6-adapter/pom.xml
index 5470930..e435aba 100755
--- a/distribution/saml-adapters/as7-eap6-adapter/pom.xml
+++ b/distribution/saml-adapters/as7-eap6-adapter/pom.xml
@@ -30,9 +30,21 @@
<artifactId>keycloak-saml-as7-eap6-adapter-dist-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-modules</module>
- <module>as7-adapter-zip</module>
+ <!--<module>as7-adapter-zip</module>-->
<module>eap6-adapter-zip</module>
</modules>
</project>
distribution/saml-adapters/pom.xml 10(+5 -5)
diff --git a/distribution/saml-adapters/pom.xml b/distribution/saml-adapters/pom.xml
index 8dc486e..1a5d369 100755
--- a/distribution/saml-adapters/pom.xml
+++ b/distribution/saml-adapters/pom.xml
@@ -32,13 +32,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>
diff --git a/examples/fuse/product-app-fuse/pom.xml b/examples/fuse/product-app-fuse/pom.xml
index af40d47..fef73a1 100755
--- a/examples/fuse/product-app-fuse/pom.xml
+++ b/examples/fuse/product-app-fuse/pom.xml
@@ -59,6 +59,10 @@
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-simple</artifactId>
+ </dependency>
<!-- Dependency for jaxws client to allow sending request to jaxws endpoint provided by cxf-jaxws-example -->
<dependency>
model/infinispan/pom.xml 4(+4 -0)
diff --git a/model/infinispan/pom.xml b/model/infinispan/pom.xml
index c935f7d..5c3efbb 100755
--- a/model/infinispan/pom.xml
+++ b/model/infinispan/pom.xml
@@ -45,6 +45,10 @@
<artifactId>infinispan-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
model/jpa/pom.xml 4(+4 -0)
diff --git a/model/jpa/pom.xml b/model/jpa/pom.xml
index 6599328..51424e0 100755
--- a/model/jpa/pom.xml
+++ b/model/jpa/pom.xml
@@ -70,6 +70,10 @@
<artifactId>hibernate-entitymanager</artifactId>
</dependency>
<dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<exclusions>
model/pom.xml 2(+1 -1)
diff --git a/model/pom.xml b/model/pom.xml
index a4dd72b..3e5dee6 100755
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -43,7 +43,7 @@
</build>
<modules>
<module>jpa</module>
- <module>mongo</module>
+ <!--<module>mongo</module>-->
<module>infinispan</module>
</modules>
</project>
pom.xml 280(+62 -218)
diff --git a/pom.xml b/pom.xml
index 2b9d70c..90de818 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.jboss</groupId>
<artifactId>jboss-parent</artifactId>
- <version>19</version>
+ <version>19.0.0.redhat-2</version>
</parent>
<name>Keycloak</name>
@@ -35,60 +35,54 @@
<packaging>pom</packaging>
<properties>
- <product.name>Keycloak</product.name>
- <product.name-html>\u003Cdiv class="kc-logo-text"\u003E\u003Cspan\u003EKeycloak\u003C\u002Fspan\u003E\u003C\u002Fdiv\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.ER6</product.version>
<product.build-time>${timestamp}</product.build-time>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
<!-- WildFly -->
- <eap.version>7.0.0.Beta</eap.version>
- <jboss.as.version>7.2.0.Final</jboss.as.version>
- <wildfly.version>10.0.0.Final</wildfly.version>
+ <eap.version>7.0.0.ER5-redhat-1</eap.version>
+ <jboss.as.version>7.5.6.Final-redhat-2</jboss.as.version>
+ <wildfly.version>${eap.version}</wildfly.version>
+ <jboss.eap6.bom.version>6.4.6.GA</jboss.eap6.bom.version>
- <aesh.version>0.66.4</aesh.version>
- <apache.httpcomponents.version>4.5</apache.httpcomponents.version>
- <apache.httpcomponents.httpcore.version>4.4.1</apache.httpcomponents.httpcore.version>
- <apache.mime4j.version>0.6</apache.mime4j.version>
- <bouncycastle.version>1.52</bouncycastle.version>
- <dom4j.version>1.6.1</dom4j.version>
- <github.relaxng.version>2011.1</github.relaxng.version>
- <h2.version>1.3.173</h2.version>
- <hibernate.entitymanager.version>5.0.7.Final</hibernate.entitymanager.version>
- <hibernate.javax.persistence.version>1.0.0.Final</hibernate.javax.persistence.version>
- <infinispan.version>8.1.0.Final</infinispan.version>
- <jackson.version>2.5.4</jackson.version>
+ <apache.httpcomponents.version>4.5.0.redhat-1</apache.httpcomponents.version>
+ <apache.mime4j.version>0.6.0.redhat-5</apache.mime4j.version>
+ <bouncycastle.version>1.52.0.redhat-2</bouncycastle.version>
+ <dom4j.version>1.6.1.redhat-7</dom4j.version>
+ <h2.version>1.3.173.redhat-2</h2.version>
+ <hibernate.entitymanager.version>5.0.7.Final-redhat-1</hibernate.entitymanager.version>
+ <infinispan.version>8.1.1.Final-redhat-1</infinispan.version>
+ <jackson.version>2.5.4.redhat-1</jackson.version>
<javax.mail.version>1.5.5</javax.mail.version>
- <jboss.logging.version>3.3.0.Final</jboss.logging.version>
- <jboss.logging.tools.version>2.0.1.Final</jboss.logging.tools.version>
+ <jboss.logging.version>3.3.0.Final-redhat-1</jboss.logging.version>
+ <jboss.logging.tools.version>2.0.1.Final-redhat-1</jboss.logging.tools.version>
<jboss.logging.tools.wf8.version>1.2.0.Final</jboss.logging.tools.wf8.version>
- <jboss-jaxrs-api_2.0_spec>1.0.0.Final</jboss-jaxrs-api_2.0_spec>
- <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>
<log4j.version>1.2.16</log4j.version>
- <resteasy.version>3.0.14.Final</resteasy.version>
- <slf4j.version>1.7.7</slf4j.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>
- <undertow.version>1.3.15.Final</undertow.version>
- <wildfly.core.version>2.0.10.Final</wildfly.core.version>
+ <resteasy.community.version>3.0.14.Final</resteasy.community.version>
+ <slf4j.version>1.7.7.redhat-2</slf4j.version>
+ <wildfly.core.version>2.0.11.Final-redhat-1</wildfly.core.version>
<wildfly.build-tools.version>1.1.0.Final</wildfly.build-tools.version>
<!--<xmlsec.version>2.0.5</xmlsec.version>--> <!-- WILDFLY VERSION -->
- <xmlsec.version>1.5.1</xmlsec.version>
+ <xmlsec.version>1.5.8.redhat-1</xmlsec.version>
+ <commons.logging.version>1.1.1-redhat-2</commons.logging.version>
<!-- Others -->
<apacheds.version>2.0.0-M17</apacheds.version>
<apacheds.codec.version>1.0.0-M23</apacheds.codec.version>
- <google.zxing.version>3.2.1</google.zxing.version>
- <freemarker.version>2.3.23</freemarker.version>
+ <google.zxing.version>3.2.1.redhat-3</google.zxing.version>
+ <freemarker.version>2.3.23.redhat-2</freemarker.version>
<jetty9.version>9.1.0.v20131115</jetty9.version>
- <liquibase.version>3.4.1</liquibase.version>
+ <liquibase.version>3.4.1.redhat-1</liquibase.version>
<mongo.driver.version>3.2.0</mongo.driver.version>
<mysql.version>5.1.29</mysql.version>
- <osgi.version>4.2.0</osgi.version>
+ <osgi.version>5.0.0</osgi.version>
<pax.web.version>3.1.2</pax.web.version>
<postgresql.version>9.3-1100-jdbc41</postgresql.version>
- <servlet.api.30.version>1.0.2.Final</servlet.api.30.version>
- <twitter4j.version>4.0.4</twitter4j.version>
+ <servlet.api.30.version>1.0.2.Final-redhat-2</servlet.api.30.version>
+ <twitter4j.version>4.0.4.redhat-2</twitter4j.version>
<!-- Test -->
<greenmail.version>1.3.1b</greenmail.version>
@@ -164,7 +158,6 @@
<module>dependencies</module>
<module>server-spi</module>
<module>saml-core</module>
- <module>proxy</module>
<module>federation</module>
<module>services</module>
<module>themes</module>
@@ -180,39 +173,11 @@
<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.version}</version>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- <version>${bouncycastle.version}</version>
+ <groupId>org.jboss.bom</groupId>
+ <artifactId>eap-runtime-artifacts</artifactId>
+ <version>7.0.0.ER5</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
@@ -220,44 +185,9 @@
<version>${javax.mail.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.spec.javax.ws.rs</groupId>
- <artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
- <version>${jboss-jaxrs-api_2.0_spec}</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-jackson2-provider</artifactId>
- <version>${resteasy.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-client</artifactId>
- <version>${resteasy.version}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-undertow</artifactId>
- <version>${resteasy.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>async-http-servlet-3.0</artifactId>
- <version>${resteasy.version}</version>
- </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>
+ <version>${resteasy.community.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
@@ -265,46 +195,6 @@
<version>${project.version}</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>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-base</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
<version>${servlet.api.30.version}</version>
@@ -316,6 +206,18 @@
<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>
<version>${jboss.logging.version}</version>
@@ -334,6 +236,7 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -348,22 +251,12 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.1-api</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>
<version>${freemarker.version}</version>
@@ -374,17 +267,26 @@
<version>${xmlsec.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>woodstox-core-asl</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</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>
@@ -460,12 +362,6 @@
<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>
<version>${xml-apis.version}</version>
@@ -474,11 +370,6 @@
<!-- 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>
<version>${slf4j.version}</version>
<scope>test</scope>
@@ -492,16 +383,6 @@
</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>
- <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>${apache.httpcomponents.version}</version>
<exclusions>
@@ -523,22 +404,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>
@@ -557,12 +423,6 @@
<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>
@@ -571,12 +431,6 @@
<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>
@@ -586,16 +440,11 @@
<version>${wildfly.core.version}</version>
</dependency>
<dependency>
- <groupId>org.wildfly</groupId>
+ <groupId>org.jboss.eap</groupId>
<artifactId>wildfly-web-common</artifactId>
<version>${wildfly.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>
<version>${liquibase.version}</version>
@@ -615,11 +464,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>
services/pom.xml 4(+4 -0)
diff --git a/services/pom.xml b/services/pom.xml
index 17ae993..389378d 100755
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -148,6 +148,10 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
testsuite/integration/pom.xml 19(+17 -2)
diff --git a/testsuite/integration/pom.xml b/testsuite/integration/pom.xml
index d0581dc..b0ccf3c 100755
--- a/testsuite/integration/pom.xml
+++ b/testsuite/integration/pom.xml
@@ -27,7 +27,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>
@@ -232,7 +247,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.wildfly</groupId>
+ <groupId>org.jboss.eap</groupId>
<artifactId>wildfly-undertow</artifactId>
<scope>test</scope>
</dependency>
diff --git a/testsuite/integration-arquillian/tests/other/adapters/wildfly/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/wildfly/pom.xml
index f7695da..d0ea1ef 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/wildfly/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/adapters/wildfly/pom.xml
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
- <groupId>org.wildfly</groupId>
+ <groupId>org.jboss.eap</groupId>
<artifactId>wildfly-dist</artifactId>
<type>zip</type>
</dependency>
diff --git a/testsuite/integration-arquillian/tests/other/adapters/wildfly8/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/wildfly8/pom.xml
index e7cbcd9..a2f8156 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/wildfly8/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/adapters/wildfly8/pom.xml
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
- <groupId>org.wildfly</groupId>
+ <groupId>org.jboss.eap</groupId>
<artifactId>wildfly-dist</artifactId>
<type>zip</type>
</dependency>
diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml
index 84aa142..a20e27c 100644
--- a/testsuite/integration-arquillian/tests/pom.xml
+++ b/testsuite/integration-arquillian/tests/pom.xml
@@ -96,7 +96,17 @@
<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>
</dependencies>
</dependencyManagement>
@@ -343,6 +353,7 @@
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-undertow</artifactId>
<scope>compile</scope>
+ <version>${resteasy.community.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
testsuite/jetty/jetty81/pom.xml 4(+2 -2)
diff --git a/testsuite/jetty/jetty81/pom.xml b/testsuite/jetty/jetty81/pom.xml
index 010d2eb..dff3abe 100755
--- a/testsuite/jetty/jetty81/pom.xml
+++ b/testsuite/jetty/jetty81/pom.xml
@@ -31,7 +31,7 @@
<properties>
<jetty9.version>8.1.17.v20150415</jetty9.version>
</properties>
- <description />
+ <description/>
<dependencies>
<dependency>
@@ -202,7 +202,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 4(+2 -2)
diff --git a/testsuite/jetty/jetty91/pom.xml b/testsuite/jetty/jetty91/pom.xml
index 70a8539..ea07a66 100755
--- a/testsuite/jetty/jetty91/pom.xml
+++ b/testsuite/jetty/jetty91/pom.xml
@@ -31,7 +31,7 @@
<properties>
<jetty9.version>9.1.5.v20140505</jetty9.version>
</properties>
- <description />
+ <description/>
<dependencies>
<dependency>
@@ -202,7 +202,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 4(+2 -2)
diff --git a/testsuite/jetty/jetty92/pom.xml b/testsuite/jetty/jetty92/pom.xml
index 2b8e21e..69bc80c 100755
--- a/testsuite/jetty/jetty92/pom.xml
+++ b/testsuite/jetty/jetty92/pom.xml
@@ -31,7 +31,7 @@
<properties>
<jetty9.version>9.2.4.v20141103</jetty9.version>
</properties>
- <description />
+ <description/>
<dependencies>
<dependency>
@@ -202,7 +202,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 7(+0 -7)
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index 45c1708..b67a1b9 100755
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -51,13 +51,6 @@
</build>
<modules>
<module>integration</module>
- <module>proxy</module>
- <module>tomcat6</module>
- <module>tomcat7</module>
- <module>tomcat8</module>
- <module>jetty</module>
- <module>performance</module>
- <module>stress</module>
<module>integration-arquillian</module>
</modules>
testsuite/proxy/pom.xml 4(+2 -2)
diff --git a/testsuite/proxy/pom.xml b/testsuite/proxy/pom.xml
index bae27f7..a0b7a2f 100755
--- a/testsuite/proxy/pom.xml
+++ b/testsuite/proxy/pom.xml
@@ -32,7 +32,7 @@
<!--<tomcat.version>8.0.14</tomcat.version>-->
<tomcat.version>7.0.54</tomcat.version>
</properties>
- <description />
+ <description/>
<dependencies>
<dependency>
@@ -193,7 +193,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 4(+2 -2)
diff --git a/testsuite/wildfly/pom.xml b/testsuite/wildfly/pom.xml
index f4af438..40063f8 100644
--- a/testsuite/wildfly/pom.xml
+++ b/testsuite/wildfly/pom.xml
@@ -28,7 +28,7 @@
<artifactId>keycloak-testsuite-wildfly</artifactId>
<name>Keycloak WildFly 9.x Integration TestSuite</name>
- <description />
+ <description/>
<dependencies>
<dependency>
@@ -195,7 +195,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>
diff --git a/themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js b/themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js
index 0fc333a..fed9e58 100755
--- a/themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js
+++ b/themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js
@@ -755,10 +755,7 @@ module.controller('LDAPCtrl', function($scope, $location, $route, Notifications,
$scope.ldapVendors = [
{ "id": "ad", "name": "Active Directory" },
- { "id": "rhds", "name": "Red Hat Directory Server" },
- { "id": "tivoli", "name": "Tivoli" },
- { "id": "edirectory", "name": "Novell eDirectory" },
- { "id": "other", "name": "Other" }
+ { "id": "rhds", "name": "Red Hat Directory Server" }
];
$scope.authTypes = [
wildfly/adduser/pom.xml 1(+0 -1)
diff --git a/wildfly/adduser/pom.xml b/wildfly/adduser/pom.xml
index fb3132d..f41ddc6 100755
--- a/wildfly/adduser/pom.xml
+++ b/wildfly/adduser/pom.xml
@@ -45,7 +45,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/server-subsystem/pom.xml 2(+1 -1)
diff --git a/wildfly/server-subsystem/pom.xml b/wildfly/server-subsystem/pom.xml
index 8a7e070..865ac94 100755
--- a/wildfly/server-subsystem/pom.xml
+++ b/wildfly/server-subsystem/pom.xml
@@ -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>