keycloak-uncached
Changes
distribution/adapters/pom.xml 16(+8 -8)
distribution/pom.xml 10(+5 -5)
distribution/saml-adapters/pom.xml 12(+6 -6)
distribution/server-overlay/pom.xml 2(+1 -1)
forms/account-api/pom.xml 4(+2 -2)
forms/common-themes/pom.xml 4(+2 -2)
forms/login-api/pom.xml 4(+2 -2)
integration/jetty/pom.xml 4(+2 -2)
integration/pom.xml 6(+3 -3)
integration/tomcat/pom.xml 6(+3 -3)
integration/tomcat/tomcat-core/pom.xml 21(+6 -15)
model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheUserProviderFactory.java 16(+10 -6)
pom.xml 173(+106 -67)
saml/client-adapter/pom.xml 4(+2 -2)
saml/client-adapter/tomcat/pom.xml 6(+3 -3)
saml/saml-protocol/pom.xml 4(+2 -2)
services/pom.xml 5(+3 -2)
testsuite/integration/pom.xml 29(+29 -0)
testsuite/pom.xml 12(+6 -6)
wildfly/adduser/pom.xml 5(+2 -3)
wildfly/pom.xml 2(+1 -1)
Details
diff --git a/distribution/adapters/as7-eap6-adapter/pom.xml b/distribution/adapters/as7-eap6-adapter/pom.xml
index e183ddd..ed4118a 100644
--- a/distribution/adapters/as7-eap6-adapter/pom.xml
+++ b/distribution/adapters/as7-eap6-adapter/pom.xml
@@ -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 16(+8 -8)
diff --git a/distribution/adapters/pom.xml b/distribution/adapters/pom.xml
index 99b5d58..38d2e56 100755
--- a/distribution/adapters/pom.xml
+++ b/distribution/adapters/pom.xml
@@ -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>wildfly-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/pom.xml 10(+5 -5)
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 7ff759f..8f84780 100755
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -17,14 +17,14 @@
<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>server-dist</module>
+ <!--<module>proxy-dist</module>-->
+ <!--<module>server-dist</module>-->
<module>server-overlay</module>
<module>src-dist</module>
- <module>feature-packs</module>
+ <!--<module>feature-packs</module>-->
</modules>
<profiles>
diff --git a/distribution/saml-adapters/as7-eap6-adapter/pom.xml b/distribution/saml-adapters/as7-eap6-adapter/pom.xml
index 104be3c..18394f5 100755
--- a/distribution/saml-adapters/as7-eap6-adapter/pom.xml
+++ b/distribution/saml-adapters/as7-eap6-adapter/pom.xml
@@ -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 12(+6 -6)
diff --git a/distribution/saml-adapters/pom.xml b/distribution/saml-adapters/pom.xml
index 59d2261..47eeb7a 100755
--- a/distribution/saml-adapters/pom.xml
+++ b/distribution/saml-adapters/pom.xml
@@ -15,14 +15,14 @@
<packaging>pom</packaging>
<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>wildfly-adapter</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 2(+1 -1)
diff --git a/distribution/server-overlay/pom.xml b/distribution/server-overlay/pom.xml
index 279034e..7843894 100755
--- a/distribution/server-overlay/pom.xml
+++ b/distribution/server-overlay/pom.xml
@@ -15,7 +15,7 @@
<modules>
- <module>wildfly</module>
+ <!--<module>wildfly</module>-->
<module>eap6</module>
</modules>
</project>
forms/account-api/pom.xml 4(+2 -2)
diff --git a/forms/account-api/pom.xml b/forms/account-api/pom.xml
index 3dfa506..44c088e 100755
--- a/forms/account-api/pom.xml
+++ b/forms/account-api/pom.xml
@@ -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_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
forms/common-themes/pom.xml 4(+2 -2)
diff --git a/forms/common-themes/pom.xml b/forms/common-themes/pom.xml
index 0ff3b7d..7370e32 100755
--- a/forms/common-themes/pom.xml
+++ b/forms/common-themes/pom.xml
@@ -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_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
forms/login-api/pom.xml 4(+2 -2)
diff --git a/forms/login-api/pom.xml b/forms/login-api/pom.xml
index 93cad67..28e0d67 100755
--- a/forms/login-api/pom.xml
+++ b/forms/login-api/pom.xml
@@ -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_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/integration/as7-eap6/as7-subsystem/pom.xml b/integration/as7-eap6/as7-subsystem/pom.xml
index c11b802..f13f304 100755
--- a/integration/as7-eap6/as7-subsystem/pom.xml
+++ b/integration/as7-eap6/as7-subsystem/pom.xml
@@ -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/jetty/pom.xml 4(+2 -2)
diff --git a/integration/jetty/pom.xml b/integration/jetty/pom.xml
index 6c9e35d..3c5fe28 100755
--- a/integration/jetty/pom.xml
+++ b/integration/jetty/pom.xml
@@ -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 6(+3 -3)
diff --git a/integration/pom.xml b/integration/pom.xml
index d56d74b..0d39fb8 100755
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -25,13 +25,13 @@
<module>jetty</module>
<module>undertow-adapter-spi</module>
<module>undertow</module>
- <module>wildfly</module>
+ <!--<module>wildfly</module>-->
<module>servlet-filter</module>
<module>js</module>
<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 6(+3 -3)
diff --git a/integration/tomcat/pom.xml b/integration/tomcat/pom.xml
index b9eaef1..f4bec07 100755
--- a/integration/tomcat/pom.xml
+++ b/integration/tomcat/pom.xml
@@ -16,8 +16,8 @@
<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>
diff --git a/integration/tomcat/tomcat-adapter-spi/pom.xml b/integration/tomcat/tomcat-adapter-spi/pom.xml
index 761b351..c7aad7a 100755
--- a/integration/tomcat/tomcat-adapter-spi/pom.xml
+++ b/integration/tomcat/tomcat-adapter-spi/pom.xml
@@ -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 21(+6 -15)
diff --git a/integration/tomcat/tomcat-core/pom.xml b/integration/tomcat/tomcat-core/pom.xml
index 010e995..3751efe 100755
--- a/integration/tomcat/tomcat-core/pom.xml
+++ b/integration/tomcat/tomcat-core/pom.xml
@@ -12,8 +12,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 />
@@ -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>
diff --git a/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheUserProviderFactory.java b/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheUserProviderFactory.java
index ec69912..6d9f3e9 100755
--- a/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheUserProviderFactory.java
+++ b/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheUserProviderFactory.java
@@ -17,6 +17,8 @@ import org.keycloak.models.cache.CacheUserProvider;
import org.keycloak.models.cache.CacheUserProviderFactory;
import org.keycloak.models.cache.entities.CachedUser;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -33,7 +35,7 @@ public class InfinispanCacheUserProviderFactory implements CacheUserProviderFact
protected final RealmLookup emailLookup = new RealmLookup();
// Method CacheEntryCreatedEvent.getValue is available from ispn 6 (EAP6 and AS7 are on ispn 5)
- private boolean isNewInfinispan;
+ private Method eventGetValueMethod;
@Override
public CacheUserProvider create(KeycloakSession session) {
@@ -56,10 +58,8 @@ public class InfinispanCacheUserProviderFactory implements CacheUserProviderFact
protected void checkIspnVersion() {
try {
- CacheEntryCreatedEvent.class.getMethod("getValue");
- isNewInfinispan = true;
+ eventGetValueMethod = CacheEntryCreatedEvent.class.getMethod("getValue");
} catch (NoSuchMethodException nsme) {
- isNewInfinispan = false;
}
}
@@ -90,8 +90,12 @@ public class InfinispanCacheUserProviderFactory implements CacheUserProviderFact
CachedUser user;
// Try optimized version if available
- if (isNewInfinispan) {
- user = event.getValue();
+ if (eventGetValueMethod != null) {
+ try {
+ user = (CachedUser) eventGetValueMethod.invoke(event);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
} else {
String userId = event.getKey();
user = event.getCache().get(userId);
pom.xml 173(+106 -67)
diff --git a/pom.xml b/pom.xml
index 63ca35f..f852275 100755
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<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,72 @@
<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</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>
+ <!-- Mime4j version has to be in sync with eap6-supported-artifacts bom -->
+ <org.apache.james.apache-mime4j.version>0.6.0.redhat-4</org.apache.james.apache-mime4j.version>
+ <bouncycastle.crypto.version>1.52.0.redhat-2</bouncycastle.crypto.version>
+ <!-- Jakson and httpcomponents versions have to be in sync with eap6-supported-artifacts bom -->
+ <jackson.version>1.9.9.redhat-4</jackson.version>
+ <apache.httpcomponents.version>4.3.6.redhat-1</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>
<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 eap6-supported-artifacts bom -->
+ <jboss.logging.version>3.1.4.GA-redhat-2</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>
- <hibernate.javax.persistence.artifactId>hibernate-jpa-2.1-api</hibernate.javax.persistence.artifactId>
- <hibernate.entitymanager.version>4.3.10.Final</hibernate.entitymanager.version>
+ <jboss-logging-tools.version>1.2.0.Final</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, entitymanager and commons-annotation versions have to be in sync with eap6-supported-artifacts bom -->
+ <hibernate.javax.persistence.version>1.0.1.Final-redhat-3</hibernate.javax.persistence.version>
+ <hibernate.javax.persistence.artifactId>hibernate-jpa-2.0-api</hibernate.javax.persistence.artifactId>
+ <hibernate.entitymanager.version>4.2.21.Final-redhat-1</hibernate.entitymanager.version>
+ <hibernate.commons-annotations.version>4.0.2.Final-redhat-1</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>
+ <!--<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>
<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>
- <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>
- <selenium.version>2.35.0</selenium.version>
- <sun.istack.version>2.21</sun.istack.version>
+ <!--<servlet.api.30.version>1.0.2.Final</servlet.api.30.version>-->
+ <google.zxing.version>3.2.1.redhat-2</google.zxing.version>
+ <!--<github.relaxng.version>2011.1</github.relaxng.version>-->
+ <freemarker.version>2.3.23.redhat-1</freemarker.version>
+ <twitter4j.version>4.0.4.redhat-1</twitter4j.version>
+ <selenium.version>2.36.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>
+ <!--<sun.xsom.version>20140925</sun.xsom.version>
+ <javax.mail.version>1.4.5</javax.mail.version>-->
+ <infinispan.version>8.1.0.Final-redhat-1</infinispan.version>
+ <liquibase.version>3.4.1.redhat-1</liquibase.version>
<jetty9.version>9.1.0.v20131115</jetty9.version>
- <osgi.version>4.2.0</osgi.version>
+ <!--<osgi.version>4.2.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>1.5.1</xmlsec.version>-->
+ <aesh.version>0.65.1.redhat-1</aesh.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 +149,7 @@
<module>events</module>
<module>model</module>
<module>integration</module>
- <module>proxy</module>
+ <!--<module>proxy</module>-->
<module>federation</module>
<module>services</module>
<module>saml</module>
@@ -161,6 +167,13 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.jboss.bom</groupId>
+ <artifactId>eap6-supported-artifacts</artifactId>
+ <version>6.4.5.GA</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <!--<dependency>
<groupId>com.github.relaxng</groupId>
<artifactId>relaxngDatatype</artifactId>
<version>${github.relaxng.version}</version>
@@ -174,17 +187,17 @@
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-tools</artifactId>
<version>${sun.istack.version}</version>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>com.sun.xml.bind.external</groupId>
<artifactId>rngom</artifactId>
<version>${sun.jaxb.version}</version>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>com.sun.xsom</groupId>
<artifactId>xsom</artifactId>
<version>${sun.xsom.version}</version>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
@@ -195,7 +208,7 @@
<artifactId>bcpkix-jdk15on</artifactId>
<version>${bouncycastle.crypto.version}</version>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>${javax.mail.version}</version>
@@ -235,7 +248,7 @@
<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>-->
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-wildfly-adapter-subsystem</artifactId>
@@ -245,13 +258,15 @@
<groupId>io.undertow</groupId>
<artifactId>undertow-servlet</artifactId>
<version>${undertow.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-core</artifactId>
<version>${undertow.version}</version>
+ <scope>test</scope>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>${jackson.version}</version>
@@ -275,7 +290,7 @@
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
<version>${servlet.api.30.version}</version>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-wildfly-common</artifactId>
@@ -283,10 +298,22 @@
<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>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.syslog4j</groupId>
<artifactId>syslog4j</artifactId>
@@ -296,6 +323,7 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -320,17 +348,17 @@
<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.hibernate</groupId>-->
+ <!--<artifactId>hibernate-entitymanager</artifactId>-->
+ <!--<version>${hibernate.entitymanager.version}</version>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>${freemarker.version}</version>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
<version>${xmlsec.version}</version>
@@ -346,6 +374,11 @@
<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 -->
@@ -421,12 +454,12 @@
<version>${jmeter.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>${dom4j.version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
@@ -434,11 +467,11 @@
<scope>test</scope>
</dependency>
<!-- Older 1.5.10 binding required by embedded ApacheDS -->
- <dependency>
+ <!--<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
@@ -452,16 +485,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>
@@ -489,7 +522,7 @@
<artifactId>wildfly-controller</artifactId>
<version>${wildfly.core.version}</version>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-server</artifactId>
<version>${wildfly.core.version}</version>
@@ -498,7 +531,7 @@
<groupId>org.wildfly</groupId>
<artifactId>wildfly-ee</artifactId>
<version>${wildfly.version}</version>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-feature-pack</artifactId>
@@ -511,13 +544,13 @@
<version>${wildfly.version}</version>
<type>zip</type>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-subsystem-test</artifactId>
<version>${wildfly.core.version}</version>
<type>pom</type>
<scope>test</scope>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-undertow</artifactId>
@@ -530,7 +563,7 @@
<version>${wildfly.core.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-core-feature-pack</artifactId>
<type>pom</type>
@@ -546,7 +579,7 @@
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-version</artifactId>
<version>${wildfly.core.version}</version>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-web-common</artifactId>
@@ -562,13 +595,19 @@
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>
<version>${infinispan.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.marshalling</groupId>
+ <artifactId>jboss-marshalling-osgi</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>
<version>${liquibase.version}</version>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
@@ -577,7 +616,7 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.enterprise</artifactId>
<version>${osgi.version}</version>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-runtime</artifactId>
diff --git a/saml/client-adapter/as7-eap6/subsystem/pom.xml b/saml/client-adapter/as7-eap6/subsystem/pom.xml
index 04e154e..fccd6ee 100755
--- a/saml/client-adapter/as7-eap6/subsystem/pom.xml
+++ b/saml/client-adapter/as7-eap6/subsystem/pom.xml
@@ -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 4(+2 -2)
diff --git a/saml/client-adapter/pom.xml b/saml/client-adapter/pom.xml
index 3f324f5..8097e57 100755
--- a/saml/client-adapter/pom.xml
+++ b/saml/client-adapter/pom.xml
@@ -17,8 +17,8 @@
<module>core</module>
<module>undertow</module>
<module>tomcat</module>
- <module>jetty</module>
- <module>wildfly</module>
+ <!--<module>jetty</module>-->
+ <!--<module>wildfly</module>-->
<module>as7-eap6</module>
<module>servlet-filter</module>
</modules>
saml/client-adapter/tomcat/pom.xml 6(+3 -3)
diff --git a/saml/client-adapter/tomcat/pom.xml b/saml/client-adapter/tomcat/pom.xml
index c086528..bf3d333 100755
--- a/saml/client-adapter/tomcat/pom.xml
+++ b/saml/client-adapter/tomcat/pom.xml
@@ -15,8 +15,8 @@
<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/saml/client-adapter/tomcat/tomcat-core/pom.xml b/saml/client-adapter/tomcat/tomcat-core/pom.xml
index 8c16496..eb52c10 100755
--- a/saml/client-adapter/tomcat/tomcat-core/pom.xml
+++ b/saml/client-adapter/tomcat/tomcat-core/pom.xml
@@ -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/saml-protocol/pom.xml 4(+2 -2)
diff --git a/saml/saml-protocol/pom.xml b/saml/saml-protocol/pom.xml
index 31d285d..bad5e65 100755
--- a/saml/saml-protocol/pom.xml
+++ b/saml/saml-protocol/pom.xml
@@ -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_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
services/pom.xml 5(+3 -2)
diff --git a/services/pom.xml b/services/pom.xml
index 2a0b584..6aadcaf 100755
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -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_1.1_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
testsuite/integration/pom.xml 29(+29 -0)
diff --git a/testsuite/integration/pom.xml b/testsuite/integration/pom.xml
index cac71a5..9d80058 100755
--- a/testsuite/integration/pom.xml
+++ b/testsuite/integration/pom.xml
@@ -13,6 +13,21 @@
<name>Keycloak Integration TestSuite</name>
<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>
<groupId>org.bouncycastle</groupId>
@@ -46,14 +61,20 @@
<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>
+ <version>3.0.10.Final</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
+ <version>3.0.10.Final</version>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
@@ -72,18 +93,26 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
+ <version>3.0.10.Final</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-undertow</artifactId>
+ <version>3.0.10.Final</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-multipart-provider</artifactId>
+ <version>3.0.10.Final</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson-provider</artifactId>
+ <version>3.0.10.Final</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.zxing</groupId>
diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml
index 1c5ee06..f619436 100644
--- a/testsuite/integration-arquillian/tests/pom.xml
+++ b/testsuite/integration-arquillian/tests/pom.xml
@@ -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/pom.xml 12(+6 -6)
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index cfe2a0f..620747d 100755
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -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>
wildfly/adduser/pom.xml 5(+2 -3)
diff --git a/wildfly/adduser/pom.xml b/wildfly/adduser/pom.xml
index 9818c51..f498a67 100755
--- a/wildfly/adduser/pom.xml
+++ b/wildfly/adduser/pom.xml
@@ -42,9 +42,8 @@
<artifactId>keycloak-core</artifactId>
</dependency>
<dependency>
- <groupId>org.wildfly.core</groupId>
- <artifactId>wildfly-domain-management</artifactId>
- <version>${wildfly.core.version}</version>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-domain-management</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.aesh</groupId>
wildfly/pom.xml 2(+1 -1)
diff --git a/wildfly/pom.xml b/wildfly/pom.xml
index 6561c7a..c6e7c55 100755
--- a/wildfly/pom.xml
+++ b/wildfly/pom.xml
@@ -16,7 +16,7 @@
<modules>
<module>adduser</module>
<module>extensions</module>
- <module>server-subsystem</module>
+ <!--<module>server-subsystem</module>-->
<module>server-eap6-subsystem</module>
</modules>
</project>
diff --git a/wildfly/server-eap6-subsystem/pom.xml b/wildfly/server-eap6-subsystem/pom.xml
index 2c7f640..ed95546 100755
--- a/wildfly/server-eap6-subsystem/pom.xml
+++ b/wildfly/server-eap6-subsystem/pom.xml
@@ -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>