diff --git a/adapters/oidc/fuse7/undertow/pom.xml b/adapters/oidc/fuse7/undertow/pom.xml index af793cdaf3e..27ccc27fc6a 100644 --- a/adapters/oidc/fuse7/undertow/pom.xml +++ b/adapters/oidc/fuse7/undertow/pom.xml @@ -42,7 +42,7 @@ org.keycloak.*;version="${project.version}", org.keycloak.adapters.osgi.*;version="${project.version}", org.ops4j.pax.web.*;version="[7.1,9)", - javax.servlet.*;version="[2.5,4)";resolution:=optional, + javax.servlet.*;version="[3.1,5)";resolution:=optional, org.apache.cxf.transport.http;resolution:=optional;version="[3,4)", org.apache.cxf.transport.http_undertow;resolution:=optional;version="[3,4)", org.apache.cxf.transport.servlet;resolution:=optional;version="[3,4)", diff --git a/adapters/oidc/osgi-adapter/pom.xml b/adapters/oidc/osgi-adapter/pom.xml index 1032a112ee0..6b35c7ddb8a 100755 --- a/adapters/oidc/osgi-adapter/pom.xml +++ b/adapters/oidc/osgi-adapter/pom.xml @@ -40,7 +40,7 @@ org.ops4j.pax.web.*;version="[3.0,8)", - javax.servlet.*;version="[2.5,4)";resolution:=optional, + javax.servlet.*;version="[3.1,5)";resolution:=optional, org.eclipse.jetty.*;version="[8.1,10)";resolution:=optional, org.keycloak.*;version="${project.version}", org.apache.cxf.transport.http;resolution:=optional;version="[3,4)", diff --git a/adapters/oidc/servlet-filter/pom.xml b/adapters/oidc/servlet-filter/pom.xml index 2a23281c067..7ea74e8a8cf 100755 --- a/adapters/oidc/servlet-filter/pom.xml +++ b/adapters/oidc/servlet-filter/pom.xml @@ -38,7 +38,7 @@ org.keycloak.adapters.servlet.* - javax.servlet.*;version="[2.5,4)";resolution:=optional, + javax.servlet.*;version="[3.1,5)";resolution:=optional, org.keycloak.*;version="${project.version}", *;resolution:=optional diff --git a/adapters/oidc/undertow/pom.xml b/adapters/oidc/undertow/pom.xml index faab5767ba5..dc1865dc81f 100755 --- a/adapters/oidc/undertow/pom.xml +++ b/adapters/oidc/undertow/pom.xml @@ -39,6 +39,7 @@ io.undertow.*;version="[1.4,3)", + javax.servlet.*;version="[3.1,5)";resolution:=optional, *;resolution:=optional diff --git a/testsuite/integration-arquillian/HOW-TO-RUN.md b/testsuite/integration-arquillian/HOW-TO-RUN.md index 2bcf1e4eecf..17d6316e32e 100644 --- a/testsuite/integration-arquillian/HOW-TO-RUN.md +++ b/testsuite/integration-arquillian/HOW-TO-RUN.md @@ -182,8 +182,8 @@ Assumed you downloaded `jboss-fuse-karaf-6.3.0.redhat-229.zip` ### JBoss Fuse 7.X -1) Download JBoss Fuse 7 to your filesystem. It can be downloaded from http://origin-repository.jboss.org/nexus/content/groups/m2-proxy/org/jboss/fuse/fuse-karaf -Assumed you downloaded `fuse-karaf-7.0.0.fuse-000202.zip` +1) Download JBoss Fuse 7 to your filesystem. It can be downloaded from http://origin-repository.jboss.org/nexus/content/groups/m2-proxy/org/jboss/fuse/fuse-karaf (Fuse 7.1 or higher is required) +Assumed you downloaded `fuse-karaf-7.1.0.fuse-710029.zip` 2) Install to your local maven repository and change the properties according to your env (This step can be likely avoided if you somehow configure your local maven settings to point directly to Fuse repo): @@ -191,9 +191,9 @@ Assumed you downloaded `fuse-karaf-7.0.0.fuse-000202.zip` mvn install:install-file \ -DgroupId=org.jboss.fuse \ -DartifactId=fuse-karaf \ - -Dversion=7.0.0.fuse-000202 \ + -Dversion=7.1.0.fuse-710029 \ -Dpackaging=zip \ - -Dfile=/mydownloads/fuse-karaf-7.0.0.fuse-000202.zip + -Dfile=/mydownloads/fuse-karaf-7.1.0.fuse-710029.zip 3) Prepare Fuse and run the tests (change props according to your environment, versions etc): @@ -203,7 +203,7 @@ Assumed you downloaded `fuse-karaf-7.0.0.fuse-000202.zip` mvn -f testsuite/integration-arquillian/servers/pom.xml \ clean install \ -Papp-server-fuse7x \ - -Dfuse7x.version=7.0.0.fuse-000202 \ + -Dfuse7x.version=7.1.0.fuse-710029 \ -Dapp.server.karaf.update.config=true \ -Dmaven.local.settings=$HOME/.m2/settings.xml \ -Drepositories=,http://REPO-SERVER/brewroot/repos/sso-7.1-build/latest/maven/ \ diff --git a/testsuite/integration-arquillian/test-apps/fuse/camel-fuse7-undertow/pom.xml b/testsuite/integration-arquillian/test-apps/fuse/camel-fuse7-undertow/pom.xml index 3a230ffb554..9746863cee0 100755 --- a/testsuite/integration-arquillian/test-apps/fuse/camel-fuse7-undertow/pom.xml +++ b/testsuite/integration-arquillian/test-apps/fuse/camel-fuse7-undertow/pom.xml @@ -35,8 +35,8 @@ - javax.servlet;version="[3,4)", - javax.servlet.http;version="[3,4)", + javax.servlet;version="[3.1,5)", + javax.servlet.http;version="[3.1,5)", javax.net.ssl, org.apache.camel.*, io.undertow.*;version="[1.4,3)", diff --git a/testsuite/integration-arquillian/test-apps/fuse/camel/pom.xml b/testsuite/integration-arquillian/test-apps/fuse/camel/pom.xml index 2d5b3ff7304..b8fa806b537 100755 --- a/testsuite/integration-arquillian/test-apps/fuse/camel/pom.xml +++ b/testsuite/integration-arquillian/test-apps/fuse/camel/pom.xml @@ -36,8 +36,8 @@ - javax.servlet;version="[3,4)", - javax.servlet.http;version="[3,4)", + javax.servlet;version="[3.1,5)", + javax.servlet.http;version="[3.1,5)", org.apache.camel.*, org.apache.camel;version="[2.13,3)", org.eclipse.jetty.security;version="[8,10)", diff --git a/testsuite/integration-arquillian/test-apps/fuse/customer-app-fuse/pom.xml b/testsuite/integration-arquillian/test-apps/fuse/customer-app-fuse/pom.xml index 1bd9157d975..cf5851eeb88 100755 --- a/testsuite/integration-arquillian/test-apps/fuse/customer-app-fuse/pom.xml +++ b/testsuite/integration-arquillian/test-apps/fuse/customer-app-fuse/pom.xml @@ -45,7 +45,7 @@ org.apache.http.impl.cookie.*;version=${apache.httpcomponents.version}, org.apache.http.impl.execchain.*;version=${apache.httpcomponents.version}, org.apache.http.*;version=${apache.httpcomponents.httpcore.version}, - javax.servlet.*;version="[2.5,4)", + javax.servlet.*;version="[3.1,5)", org.keycloak.adapters.authentication;version="${project.version}";resolution:=optional, org.keycloak.adapters.jetty;version="${project.version}";resolution:=optional, org.keycloak.adapters;version="${project.version}", diff --git a/testsuite/integration-arquillian/test-apps/fuse/external-config/pom.xml b/testsuite/integration-arquillian/test-apps/fuse/external-config/pom.xml index 9e022ad73df..8f4c43ede93 100755 --- a/testsuite/integration-arquillian/test-apps/fuse/external-config/pom.xml +++ b/testsuite/integration-arquillian/test-apps/fuse/external-config/pom.xml @@ -46,7 +46,7 @@ org.apache.http.impl.cookie.*;version=${apache.httpcomponents.version}, org.apache.http.impl.execchain.*;version=${apache.httpcomponents.version}, org.apache.http.*;version=${apache.httpcomponents.httpcore.version}, - javax.servlet.*;version="[2.5,4)", + javax.servlet.*;version="[3.1,5)", org.keycloak.adapters.jetty;version="${project.version}";resolution:=optional, org.keycloak.adapters;version="${project.version}", org.keycloak.constants;version="${project.version}", diff --git a/testsuite/integration-arquillian/test-apps/fuse/product-app-fuse7-undertow/pom.xml b/testsuite/integration-arquillian/test-apps/fuse/product-app-fuse7-undertow/pom.xml index d05e7583ab8..a2eccd60d84 100755 --- a/testsuite/integration-arquillian/test-apps/fuse/product-app-fuse7-undertow/pom.xml +++ b/testsuite/integration-arquillian/test-apps/fuse/product-app-fuse7-undertow/pom.xml @@ -43,6 +43,7 @@ org.apache.cxf.*;version="[2.7,3.3)", org.keycloak.*;version="${project.version}", org.keycloak.adapters.authentication;version="${project.version}";resolution:=optional, + javax.servlet.*;version="[3.1,5)", *;resolution:=optional