From bb77c717c9840e702ea8d61a360cc71296f86ecd Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Tue, 9 Feb 2016 20:15:23 +0100 Subject: [PATCH] KEYCLOAK-2303 Update dependency versions to align with WildFly 10 --- .../oidc/as7-eap6/as7-adapter-spi/pom.xml | 2 +- adapters/oidc/as7-eap6/as7-adapter/pom.xml | 2 +- adapters/oidc/as7-eap6/as7-subsystem/pom.xml | 8 +- adapters/oidc/jaxrs-oauth-client/pom.xml | 2 +- adapters/oidc/servlet-filter/pom.xml | 2 +- adapters/oidc/servlet-oauth-client/pom.xml | 2 +- adapters/oidc/spring-security/pom.xml | 5 +- adapters/oidc/undertow/pom.xml | 2 +- adapters/oidc/wildfly/wf8-subsystem/pom.xml | 10 +- adapters/oidc/wildfly/wildfly-adapter/pom.xml | 2 +- adapters/saml/as7-eap6/adapter/pom.xml | 2 +- adapters/saml/as7-eap6/subsystem/pom.xml | 10 +- adapters/saml/servlet-filter/pom.xml | 2 +- adapters/saml/undertow/pom.xml | 2 +- adapters/saml/wildfly/wildfly-adapter/pom.xml | 2 +- adapters/spi/jboss-adapter-core/pom.xml | 2 +- adapters/spi/servlet-adapter-spi/pom.xml | 2 +- .../adapters/servlet/FilterSessionStore.java | 48 +++++++- adapters/spi/undertow-adapter-spi/pom.xml | 2 +- examples/basic-auth/pom.xml | 2 +- .../broker/twitter-authentication/pom.xml | 2 +- examples/cors/database-service/pom.xml | 2 +- .../demo-template/admin-access-app/pom.xml | 2 +- .../demo-template/customer-app-filter/pom.xml | 2 +- examples/demo-template/customer-app/pom.xml | 2 +- .../demo-template/database-service/pom.xml | 2 +- .../demo-template/offline-access-app/pom.xml | 2 +- examples/demo-template/product-app/pom.xml | 2 +- .../demo-template/service-account/pom.xml | 2 +- .../demo-template/third-party-cdi/pom.xml | 3 +- examples/demo-template/third-party/pom.xml | 3 +- examples/fuse/customer-app-fuse/pom.xml | 2 +- examples/fuse/product-app-fuse/pom.xml | 2 +- examples/kerberos/pom.xml | 2 +- examples/ldap/pom.xml | 2 +- model/jpa/pom.xml | 2 +- pom.xml | 116 +++++++++--------- services/pom.xml | 4 +- .../tests/other/adapters/eap6/pom.xml | 2 +- .../integration-arquillian/tests/pom.xml | 2 +- testsuite/integration/pom.xml | 4 +- testsuite/jetty/jetty81/pom.xml | 4 +- testsuite/jetty/jetty91/pom.xml | 4 +- testsuite/jetty/jetty92/pom.xml | 4 +- testsuite/performance/pom.xml | 3 +- testsuite/proxy/pom.xml | 4 +- testsuite/tomcat6/pom.xml | 4 +- testsuite/tomcat7/pom.xml | 4 +- testsuite/tomcat8/pom.xml | 4 +- testsuite/wildfly/pom.xml | 4 +- wildfly/server-subsystem/pom.xml | 7 -- 51 files changed, 170 insertions(+), 145 deletions(-) diff --git a/adapters/oidc/as7-eap6/as7-adapter-spi/pom.xml b/adapters/oidc/as7-eap6/as7-adapter-spi/pom.xml index 217b417b95..c926324277 100755 --- a/adapters/oidc/as7-eap6/as7-adapter-spi/pom.xml +++ b/adapters/oidc/as7-eap6/as7-adapter-spi/pom.xml @@ -41,7 +41,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided diff --git a/adapters/oidc/as7-eap6/as7-adapter/pom.xml b/adapters/oidc/as7-eap6/as7-adapter/pom.xml index 55037af9de..a9251d5975 100755 --- a/adapters/oidc/as7-eap6/as7-adapter/pom.xml +++ b/adapters/oidc/as7-eap6/as7-adapter/pom.xml @@ -73,7 +73,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided diff --git a/adapters/oidc/as7-eap6/as7-subsystem/pom.xml b/adapters/oidc/as7-eap6/as7-subsystem/pom.xml index e3ab393fcb..8938e88063 100755 --- a/adapters/oidc/as7-eap6/as7-subsystem/pom.xml +++ b/adapters/oidc/as7-eap6/as7-subsystem/pom.xml @@ -64,25 +64,25 @@ org.jboss.as jboss-as-naming - ${jboss.version} + ${jboss.as.version} org.jboss.as jboss-as-server - ${jboss.version} + ${jboss.as.version} org.jboss.as jboss-as-ee - ${jboss.version} + ${jboss.as.version} org.jboss.as jboss-as-web - ${jboss.version} + ${jboss.as.version} diff --git a/adapters/oidc/jaxrs-oauth-client/pom.xml b/adapters/oidc/jaxrs-oauth-client/pom.xml index 60e8ae74a7..eac0f49ce4 100755 --- a/adapters/oidc/jaxrs-oauth-client/pom.xml +++ b/adapters/oidc/jaxrs-oauth-client/pom.xml @@ -72,7 +72,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided diff --git a/adapters/oidc/servlet-filter/pom.xml b/adapters/oidc/servlet-filter/pom.xml index 9e39669a79..1e012391d0 100755 --- a/adapters/oidc/servlet-filter/pom.xml +++ b/adapters/oidc/servlet-filter/pom.xml @@ -75,7 +75,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided diff --git a/adapters/oidc/servlet-oauth-client/pom.xml b/adapters/oidc/servlet-oauth-client/pom.xml index 0f2891ef8f..560eecf8b7 100755 --- a/adapters/oidc/servlet-oauth-client/pom.xml +++ b/adapters/oidc/servlet-oauth-client/pom.xml @@ -53,7 +53,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided diff --git a/adapters/oidc/spring-security/pom.xml b/adapters/oidc/spring-security/pom.xml index c55275b80d..ff39fb5393 100755 --- a/adapters/oidc/spring-security/pom.xml +++ b/adapters/oidc/spring-security/pom.xml @@ -41,7 +41,6 @@ org.keycloak keycloak-core - ${project.version} org.keycloak @@ -50,11 +49,10 @@ org.keycloak keycloak-adapter-core - ${project.version} org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided @@ -82,7 +80,6 @@ org.bouncycastle bcprov-jdk15on - ${bouncycastle.crypto.version} runtime diff --git a/adapters/oidc/undertow/pom.xml b/adapters/oidc/undertow/pom.xml index 80d476e1e6..ed5e7ceeef 100755 --- a/adapters/oidc/undertow/pom.xml +++ b/adapters/oidc/undertow/pom.xml @@ -75,7 +75,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided diff --git a/adapters/oidc/wildfly/wf8-subsystem/pom.xml b/adapters/oidc/wildfly/wf8-subsystem/pom.xml index 7176f6d8a2..871775c147 100755 --- a/adapters/oidc/wildfly/wf8-subsystem/pom.xml +++ b/adapters/oidc/wildfly/wf8-subsystem/pom.xml @@ -79,21 +79,15 @@ org.jboss.logging jboss-logging-annotations - ${jboss-logging-tools.version} - + ${jboss.logging.tools.wf8.version} provided - true org.jboss.logging jboss-logging-processor - ${jboss-logging-tools.version} - + ${jboss.logging.tools.wf8.version} provided - true diff --git a/adapters/oidc/wildfly/wildfly-adapter/pom.xml b/adapters/oidc/wildfly/wildfly-adapter/pom.xml index c92a5aeeb9..8e83abdbc2 100755 --- a/adapters/oidc/wildfly/wildfly-adapter/pom.xml +++ b/adapters/oidc/wildfly/wildfly-adapter/pom.xml @@ -89,7 +89,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided diff --git a/adapters/saml/as7-eap6/adapter/pom.xml b/adapters/saml/as7-eap6/adapter/pom.xml index f190d76e2d..25cf62f4fe 100755 --- a/adapters/saml/as7-eap6/adapter/pom.xml +++ b/adapters/saml/as7-eap6/adapter/pom.xml @@ -53,7 +53,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided diff --git a/adapters/saml/as7-eap6/subsystem/pom.xml b/adapters/saml/as7-eap6/subsystem/pom.xml index 34d1e2edab..47e9d9edd8 100755 --- a/adapters/saml/as7-eap6/subsystem/pom.xml +++ b/adapters/saml/as7-eap6/subsystem/pom.xml @@ -64,25 +64,25 @@ org.jboss.as jboss-as-naming - ${jboss.version} + ${jboss.as.version} org.jboss.as jboss-as-server - ${jboss.version} + ${jboss.as.version} org.jboss.as jboss-as-ee - ${jboss.version} + ${jboss.as.version} org.jboss.as jboss-as-web - ${jboss.version} + ${jboss.as.version} @@ -104,7 +104,7 @@ projects that depend on this project.--> org.jboss.as jboss-as-controller - ${jboss.version} + ${jboss.as.version} diff --git a/adapters/saml/servlet-filter/pom.xml b/adapters/saml/servlet-filter/pom.xml index e3dbee8c93..69ce19b269 100755 --- a/adapters/saml/servlet-filter/pom.xml +++ b/adapters/saml/servlet-filter/pom.xml @@ -61,7 +61,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided diff --git a/adapters/saml/undertow/pom.xml b/adapters/saml/undertow/pom.xml index ce7006e202..f429c4565e 100755 --- a/adapters/saml/undertow/pom.xml +++ b/adapters/saml/undertow/pom.xml @@ -69,7 +69,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided diff --git a/adapters/saml/wildfly/wildfly-adapter/pom.xml b/adapters/saml/wildfly/wildfly-adapter/pom.xml index acc426f30e..7b4e9a7903 100755 --- a/adapters/saml/wildfly/wildfly-adapter/pom.xml +++ b/adapters/saml/wildfly/wildfly-adapter/pom.xml @@ -69,7 +69,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided diff --git a/adapters/spi/jboss-adapter-core/pom.xml b/adapters/spi/jboss-adapter-core/pom.xml index 9e05f3387b..a2229e30c7 100755 --- a/adapters/spi/jboss-adapter-core/pom.xml +++ b/adapters/spi/jboss-adapter-core/pom.xml @@ -67,7 +67,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided diff --git a/adapters/spi/servlet-adapter-spi/pom.xml b/adapters/spi/servlet-adapter-spi/pom.xml index c4c944bb32..d6f82e2889 100755 --- a/adapters/spi/servlet-adapter-spi/pom.xml +++ b/adapters/spi/servlet-adapter-spi/pom.xml @@ -45,7 +45,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided diff --git a/adapters/spi/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/FilterSessionStore.java b/adapters/spi/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/FilterSessionStore.java index 6a17c8e810..2470ef4d1c 100755 --- a/adapters/spi/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/FilterSessionStore.java +++ b/adapters/spi/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/FilterSessionStore.java @@ -23,6 +23,7 @@ import org.keycloak.adapters.spi.KeycloakAccount; import org.keycloak.common.util.Encode; import org.keycloak.common.util.MultivaluedHashMap; +import javax.servlet.ReadListener; import javax.servlet.ServletException; import javax.servlet.ServletInputStream; import javax.servlet.http.HttpServletRequest; @@ -173,11 +174,54 @@ public class FilterSessionStore implements AdapterSessionStore { public ServletInputStream getInputStream() throws IOException { if (needRequestRestore && body != null) { - final ByteArrayInputStream is = new ByteArrayInputStream(body); return new ServletInputStream() { + private int lastIndex = 0; + private ReadListener readListener = null; + + @Override + public boolean isFinished() { + return lastIndex == body.length; + } + + @Override + public boolean isReady() { + return true; + } + + @Override + public void setReadListener(ReadListener readListener) { + this.readListener = readListener; + if (!isFinished()) { + try { + readListener.onDataAvailable(); + } catch (IOException e) { + readListener.onError(e); + } + } else { + try { + readListener.onAllDataRead(); + } catch (IOException e) { + readListener.onError(e); + } + } + } + @Override public int read() throws IOException { - return is.read(); + int i = -1; + if (!isFinished()) { + i = body[lastIndex]; + lastIndex++; + if (isFinished() && readListener != null) { + try { + readListener.onAllDataRead(); + } catch (IOException e) { + readListener.onError(e); + throw e; + } + } + } + return i; } }; } diff --git a/adapters/spi/undertow-adapter-spi/pom.xml b/adapters/spi/undertow-adapter-spi/pom.xml index 7912f1da73..1aae136620 100755 --- a/adapters/spi/undertow-adapter-spi/pom.xml +++ b/adapters/spi/undertow-adapter-spi/pom.xml @@ -47,7 +47,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided diff --git a/examples/basic-auth/pom.xml b/examples/basic-auth/pom.xml index a73db6233a..a1ef3c2750 100755 --- a/examples/basic-auth/pom.xml +++ b/examples/basic-auth/pom.xml @@ -50,7 +50,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided diff --git a/examples/broker/twitter-authentication/pom.xml b/examples/broker/twitter-authentication/pom.xml index 83ea633dab..7a92b0820b 100755 --- a/examples/broker/twitter-authentication/pom.xml +++ b/examples/broker/twitter-authentication/pom.xml @@ -58,7 +58,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided diff --git a/examples/cors/database-service/pom.xml b/examples/cors/database-service/pom.xml index 2c22c0bb4a..44262eddb2 100755 --- a/examples/cors/database-service/pom.xml +++ b/examples/cors/database-service/pom.xml @@ -48,7 +48,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided diff --git a/examples/demo-template/admin-access-app/pom.xml b/examples/demo-template/admin-access-app/pom.xml index cfabf9b53d..b3f300105c 100755 --- a/examples/demo-template/admin-access-app/pom.xml +++ b/examples/demo-template/admin-access-app/pom.xml @@ -42,7 +42,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided diff --git a/examples/demo-template/customer-app-filter/pom.xml b/examples/demo-template/customer-app-filter/pom.xml index fb17b6b48a..758d6fbb99 100755 --- a/examples/demo-template/customer-app-filter/pom.xml +++ b/examples/demo-template/customer-app-filter/pom.xml @@ -42,7 +42,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided diff --git a/examples/demo-template/customer-app/pom.xml b/examples/demo-template/customer-app/pom.xml index 4c52e0579e..1fdf6db5f0 100755 --- a/examples/demo-template/customer-app/pom.xml +++ b/examples/demo-template/customer-app/pom.xml @@ -42,7 +42,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided diff --git a/examples/demo-template/database-service/pom.xml b/examples/demo-template/database-service/pom.xml index f3465e76e5..a864ceed65 100755 --- a/examples/demo-template/database-service/pom.xml +++ b/examples/demo-template/database-service/pom.xml @@ -48,7 +48,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided diff --git a/examples/demo-template/offline-access-app/pom.xml b/examples/demo-template/offline-access-app/pom.xml index 8c715ddbce..3cefb0dedf 100644 --- a/examples/demo-template/offline-access-app/pom.xml +++ b/examples/demo-template/offline-access-app/pom.xml @@ -42,7 +42,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided diff --git a/examples/demo-template/product-app/pom.xml b/examples/demo-template/product-app/pom.xml index 93d2425fa0..a44de34a16 100755 --- a/examples/demo-template/product-app/pom.xml +++ b/examples/demo-template/product-app/pom.xml @@ -42,7 +42,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided diff --git a/examples/demo-template/service-account/pom.xml b/examples/demo-template/service-account/pom.xml index 33f9e5ef54..68e69c833b 100644 --- a/examples/demo-template/service-account/pom.xml +++ b/examples/demo-template/service-account/pom.xml @@ -34,7 +34,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided diff --git a/examples/demo-template/third-party-cdi/pom.xml b/examples/demo-template/third-party-cdi/pom.xml index 73723b3c47..5dd08c6d61 100755 --- a/examples/demo-template/third-party-cdi/pom.xml +++ b/examples/demo-template/third-party-cdi/pom.xml @@ -34,8 +34,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec - 1.0.1.Final + jboss-servlet-api_3.1_spec provided diff --git a/examples/demo-template/third-party/pom.xml b/examples/demo-template/third-party/pom.xml index 7ebdbbb491..ebbecaf84e 100755 --- a/examples/demo-template/third-party/pom.xml +++ b/examples/demo-template/third-party/pom.xml @@ -34,8 +34,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec - 1.0.1.Final + jboss-servlet-api_3.1_spec provided diff --git a/examples/fuse/customer-app-fuse/pom.xml b/examples/fuse/customer-app-fuse/pom.xml index 196227c927..0dea1c4a19 100755 --- a/examples/fuse/customer-app-fuse/pom.xml +++ b/examples/fuse/customer-app-fuse/pom.xml @@ -52,7 +52,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided diff --git a/examples/fuse/product-app-fuse/pom.xml b/examples/fuse/product-app-fuse/pom.xml index 5fa2684735..c24b5d1c2f 100755 --- a/examples/fuse/product-app-fuse/pom.xml +++ b/examples/fuse/product-app-fuse/pom.xml @@ -53,7 +53,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec org.keycloak diff --git a/examples/kerberos/pom.xml b/examples/kerberos/pom.xml index 9d9dc25d3f..3252d92709 100755 --- a/examples/kerberos/pom.xml +++ b/examples/kerberos/pom.xml @@ -44,7 +44,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided diff --git a/examples/ldap/pom.xml b/examples/ldap/pom.xml index d3767e3c77..241222250d 100644 --- a/examples/ldap/pom.xml +++ b/examples/ldap/pom.xml @@ -42,7 +42,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec provided diff --git a/model/jpa/pom.xml b/model/jpa/pom.xml index bbed0504ee..6b03eec27f 100755 --- a/model/jpa/pom.xml +++ b/model/jpa/pom.xml @@ -63,7 +63,7 @@ org.hibernate.javax.persistence - ${hibernate.javax.persistence.artifactId} + hibernate-jpa-2.1-api org.hibernate diff --git a/pom.xml b/pom.xml index ec2b0e6310..729989dbd0 100644 --- a/pom.xml +++ b/pom.xml @@ -40,71 +40,77 @@ ${project.version} ${timestamp} - 2.0.0-M17 - 1.0.0-M23 - 0.6 - 1.52 - 2.5.4 + + 7.0.0.Beta + 7.2.0.Final + 10.0.0.Final + + 0.66.4 + 4.3.6 + 4.3.3 - 3.0.14.Final - 4.2.1 - 1.3.10.Final - 2.7.0.Final - 3.2.0 + 0.6 + 1.52 + 1.6.1 + 2011.1 + 1.3.173 + + 4.3.10.Final + 1.0.0.Final + 8.1.0.Final + 2.5.4 + 1.5.5 3.3.0.Final 2.0.1.Final - 1.2.0.Beta1 - 1.0.4.Final + 1.2.0.Final 1.0.0.Final - 1.0.0.Final - hibernate-jpa-2.1-api - 4.3.10.Final - 1.3.173 - 5.1.29 - 9.3-1100-jdbc41 - 1.6.1 - 1.4.01 + 1.0.4.Final + 1.2.16 + 3.0.14.Final + 1.0.0.Final 1.7.7 - 10.0.0.Final - 2.0.10.Final - 1.1.0.Final - - 7.0.0.Beta - - 7.2.0.Final - - 1.0.2.Final - 3.2.1 - 2011.1 - 2.3.23 - 4.0.4 - 2.35.0 2.21 2.2.11 20140925 - 1.4.5 - 8.1.0.Final - 3.4.1 + 1.3.15.Final + 2.0.10.Final + 1.1.0.Final + + 1.5.1 + + + 2.0.0-M17 + 1.0.0-M23 + 3.2.1 + 2.3.23 9.1.0.v20131115 + 3.4.1 + 3.2.0 + 5.1.29 4.2.0 3.1.2 + 9.3-1100-jdbc41 + 4.0.4 + + + 1.3.1b + 1.3 2.10 4.12 - 1.3 - 1.2.17 - 1.3.1b - 1.5.1 - 0.66.4 + 2.7.0.Final + 2.35.0 + 1.4.01 + + 0.1.12 1.4 7.5.Final - 1.0.1.Final - 1.7.2 - 0.1.12 1.9.0 1.0.4 + 1.7.2 2.3.7 + 1.0.1.Final http://keycloak.org @@ -201,16 +207,16 @@ org.bouncycastle bcprov-jdk15on - ${bouncycastle.crypto.version} + ${bouncycastle.version} org.bouncycastle bcpkix-jdk15on - ${bouncycastle.crypto.version} + ${bouncycastle.version} javax.mail - mail + javax.mail-api ${javax.mail.version} @@ -300,8 +306,8 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec - ${servlet.api.30.version} + jboss-servlet-api_3.1_spec + ${servlet.api.31.version} org.picketlink @@ -343,7 +349,7 @@ org.hibernate.javax.persistence - ${hibernate.javax.persistence.artifactId} + hibernate-jpa-2.1-api ${hibernate.javax.persistence.version} @@ -508,7 +514,7 @@ org.apache.james apache-mime4j - ${org.apache.james.apache-mime4j.version} + ${apache.mime4j.version} commons-logging @@ -584,12 +590,6 @@ wildfly-web-common ${wildfly.version} - - org.jboss.logging - jboss-logging-processor - ${jboss-logging-tools.version} - compile - org.infinispan infinispan-core diff --git a/services/pom.xml b/services/pom.xml index 039cda97ce..425ef53cab 100755 --- a/services/pom.xml +++ b/services/pom.xml @@ -54,7 +54,7 @@ javax.mail - mail + javax.mail-api org.keycloak @@ -63,7 +63,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec org.twitter4j diff --git a/testsuite/integration-arquillian/tests/other/adapters/eap6/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/eap6/pom.xml index b3e000a7e8..6ee862ccc9 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/eap6/pom.xml +++ b/testsuite/integration-arquillian/tests/other/adapters/eap6/pom.xml @@ -69,7 +69,7 @@ org.jboss.as jboss-as-dist - ${jboss.version} + ${jboss.as.version} zip ${containers.home} diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml index 4e35234120..533745dc67 100644 --- a/testsuite/integration-arquillian/tests/pom.xml +++ b/testsuite/integration-arquillian/tests/pom.xml @@ -363,7 +363,7 @@ org.hibernate.javax.persistence - ${hibernate.javax.persistence.artifactId} + hibernate-jpa-2.1-api com.h2database diff --git a/testsuite/integration/pom.xml b/testsuite/integration/pom.xml index 6650521572..d9331f941d 100755 --- a/testsuite/integration/pom.xml +++ b/testsuite/integration/pom.xml @@ -57,7 +57,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec org.jboss.spec.javax.ws.rs @@ -183,7 +183,7 @@ org.hibernate.javax.persistence - ${hibernate.javax.persistence.artifactId} + hibernate-jpa-2.1-api com.h2database diff --git a/testsuite/jetty/jetty81/pom.xml b/testsuite/jetty/jetty81/pom.xml index 5c057cd535..73dd109cfc 100755 --- a/testsuite/jetty/jetty81/pom.xml +++ b/testsuite/jetty/jetty81/pom.xml @@ -59,7 +59,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec org.jboss.spec.javax.ws.rs @@ -165,7 +165,7 @@ org.hibernate.javax.persistence - ${hibernate.javax.persistence.artifactId} + hibernate-jpa-2.1-api com.h2database diff --git a/testsuite/jetty/jetty91/pom.xml b/testsuite/jetty/jetty91/pom.xml index 4109077b30..1bb34e9e1b 100755 --- a/testsuite/jetty/jetty91/pom.xml +++ b/testsuite/jetty/jetty91/pom.xml @@ -59,7 +59,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec org.jboss.spec.javax.ws.rs @@ -165,7 +165,7 @@ org.hibernate.javax.persistence - ${hibernate.javax.persistence.artifactId} + hibernate-jpa-2.1-api com.h2database diff --git a/testsuite/jetty/jetty92/pom.xml b/testsuite/jetty/jetty92/pom.xml index 34484d6215..76fb1537cb 100755 --- a/testsuite/jetty/jetty92/pom.xml +++ b/testsuite/jetty/jetty92/pom.xml @@ -63,7 +63,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec org.jboss.spec.javax.ws.rs @@ -165,7 +165,7 @@ org.hibernate.javax.persistence - ${hibernate.javax.persistence.artifactId} + hibernate-jpa-2.1-api com.h2database diff --git a/testsuite/performance/pom.xml b/testsuite/performance/pom.xml index f38bab591c..f18dce2fb2 100755 --- a/testsuite/performance/pom.xml +++ b/testsuite/performance/pom.xml @@ -203,8 +203,7 @@ org.hibernate.javax.persistence - ${hibernate.javax.persistence.artifactId} - ${hibernate.javax.persistence.version} + hibernate-jpa-2.1-api com.h2database diff --git a/testsuite/proxy/pom.xml b/testsuite/proxy/pom.xml index ab0082eaa9..233f4d88f4 100755 --- a/testsuite/proxy/pom.xml +++ b/testsuite/proxy/pom.xml @@ -54,7 +54,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec org.jboss.spec.javax.ws.rs @@ -156,7 +156,7 @@ org.hibernate.javax.persistence - ${hibernate.javax.persistence.artifactId} + hibernate-jpa-2.1-api com.h2database diff --git a/testsuite/tomcat6/pom.xml b/testsuite/tomcat6/pom.xml index 9090caab9f..42aeab44c0 100755 --- a/testsuite/tomcat6/pom.xml +++ b/testsuite/tomcat6/pom.xml @@ -53,7 +53,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec org.jboss.spec.javax.ws.rs @@ -165,7 +165,7 @@ org.hibernate.javax.persistence - ${hibernate.javax.persistence.artifactId} + hibernate-jpa-2.1-api com.h2database diff --git a/testsuite/tomcat7/pom.xml b/testsuite/tomcat7/pom.xml index cca4ad5e38..8ca978b8d0 100755 --- a/testsuite/tomcat7/pom.xml +++ b/testsuite/tomcat7/pom.xml @@ -77,7 +77,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec org.jboss.spec.javax.ws.rs @@ -197,7 +197,7 @@ org.hibernate.javax.persistence - ${hibernate.javax.persistence.artifactId} + hibernate-jpa-2.1-api com.h2database diff --git a/testsuite/tomcat8/pom.xml b/testsuite/tomcat8/pom.xml index 7f55823b60..1f9cbb9e10 100755 --- a/testsuite/tomcat8/pom.xml +++ b/testsuite/tomcat8/pom.xml @@ -49,7 +49,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec org.jboss.spec.javax.ws.rs @@ -169,7 +169,7 @@ org.hibernate.javax.persistence - ${hibernate.javax.persistence.artifactId} + hibernate-jpa-2.1-api com.h2database diff --git a/testsuite/wildfly/pom.xml b/testsuite/wildfly/pom.xml index e325876ab7..e907b70336 100644 --- a/testsuite/wildfly/pom.xml +++ b/testsuite/wildfly/pom.xml @@ -56,7 +56,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_3.1_spec org.jboss.spec.javax.ws.rs @@ -158,7 +158,7 @@ org.hibernate.javax.persistence - ${hibernate.javax.persistence.artifactId} + hibernate-jpa-2.1-api com.h2database diff --git a/wildfly/server-subsystem/pom.xml b/wildfly/server-subsystem/pom.xml index 7a08c7d038..4f7ce1ee01 100755 --- a/wildfly/server-subsystem/pom.xml +++ b/wildfly/server-subsystem/pom.xml @@ -70,20 +70,13 @@ org.jboss.logging jboss-logging-annotations - ${jboss-logging-tools.version} - provided - true org.jboss.logging jboss-logging-processor - provided - true