Skip to content

Commit e01562d

Browse files
grgrzybekstianst
authored andcommitted
[KEYCLOAK-9646] Increase import range for javax.servlet API to cover EAP 7.2, servlet-api 4.0
[KEYCLOAK-9646] Update HOW-TO-RUN.md for Fuse 7.1+ instructions
1 parent e271542 commit e01562d

File tree

10 files changed

+16
-14
lines changed

10 files changed

+16
-14
lines changed

adapters/oidc/fuse7/undertow/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
org.keycloak.*;version="${project.version}",
4343
org.keycloak.adapters.osgi.*;version="${project.version}",
4444
org.ops4j.pax.web.*;version="[7.1,9)",
45-
javax.servlet.*;version="[2.5,4)";resolution:=optional,
45+
javax.servlet.*;version="[3.1,5)";resolution:=optional,
4646
org.apache.cxf.transport.http;resolution:=optional;version="[3,4)",
4747
org.apache.cxf.transport.http_undertow;resolution:=optional;version="[3,4)",
4848
org.apache.cxf.transport.servlet;resolution:=optional;version="[3,4)",

adapters/oidc/osgi-adapter/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</keycloak.osgi.export>
4141
<keycloak.osgi.import>
4242
org.ops4j.pax.web.*;version="[3.0,8)",
43-
javax.servlet.*;version="[2.5,4)";resolution:=optional,
43+
javax.servlet.*;version="[3.1,5)";resolution:=optional,
4444
org.eclipse.jetty.*;version="[8.1,10)";resolution:=optional,
4545
org.keycloak.*;version="${project.version}",
4646
org.apache.cxf.transport.http;resolution:=optional;version="[3,4)",

adapters/oidc/servlet-filter/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
org.keycloak.adapters.servlet.*
3939
</keycloak.osgi.export>
4040
<keycloak.osgi.import>
41-
javax.servlet.*;version="[2.5,4)";resolution:=optional,
41+
javax.servlet.*;version="[3.1,5)";resolution:=optional,
4242
org.keycloak.*;version="${project.version}",
4343
*;resolution:=optional
4444
</keycloak.osgi.import>

adapters/oidc/undertow/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
</keycloak.osgi.export>
4040
<keycloak.osgi.import>
4141
io.undertow.*;version="[1.4,3)",
42+
javax.servlet.*;version="[3.1,5)";resolution:=optional,
4243
*;resolution:=optional
4344
</keycloak.osgi.import>
4445
</properties>

testsuite/integration-arquillian/HOW-TO-RUN.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -182,18 +182,18 @@ Assumed you downloaded `jboss-fuse-karaf-6.3.0.redhat-229.zip`
182182

183183
### JBoss Fuse 7.X
184184

185-
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
186-
Assumed you downloaded `fuse-karaf-7.0.0.fuse-000202.zip`
185+
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)
186+
Assumed you downloaded `fuse-karaf-7.1.0.fuse-710029.zip`
187187

188188
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):
189189

190190

191191
mvn install:install-file \
192192
-DgroupId=org.jboss.fuse \
193193
-DartifactId=fuse-karaf \
194-
-Dversion=7.0.0.fuse-000202 \
194+
-Dversion=7.1.0.fuse-710029 \
195195
-Dpackaging=zip \
196-
-Dfile=/mydownloads/fuse-karaf-7.0.0.fuse-000202.zip
196+
-Dfile=/mydownloads/fuse-karaf-7.1.0.fuse-710029.zip
197197

198198

199199
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`
203203
mvn -f testsuite/integration-arquillian/servers/pom.xml \
204204
clean install \
205205
-Papp-server-fuse7x \
206-
-Dfuse7x.version=7.0.0.fuse-000202 \
206+
-Dfuse7x.version=7.1.0.fuse-710029 \
207207
-Dapp.server.karaf.update.config=true \
208208
-Dmaven.local.settings=$HOME/.m2/settings.xml \
209209
-Drepositories=,http://REPO-SERVER/brewroot/repos/sso-7.1-build/latest/maven/ \

testsuite/integration-arquillian/test-apps/fuse/camel-fuse7-undertow/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
<keycloak.osgi.export>
3636
</keycloak.osgi.export>
3737
<keycloak.osgi.import>
38-
javax.servlet;version="[3,4)",
39-
javax.servlet.http;version="[3,4)",
38+
javax.servlet;version="[3.1,5)",
39+
javax.servlet.http;version="[3.1,5)",
4040
javax.net.ssl,
4141
org.apache.camel.*,
4242
io.undertow.*;version="[1.4,3)",

testsuite/integration-arquillian/test-apps/fuse/camel/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
<keycloak.osgi.export>
3737
</keycloak.osgi.export>
3838
<keycloak.osgi.import>
39-
javax.servlet;version="[3,4)",
40-
javax.servlet.http;version="[3,4)",
39+
javax.servlet;version="[3.1,5)",
40+
javax.servlet.http;version="[3.1,5)",
4141
org.apache.camel.*,
4242
org.apache.camel;version="[2.13,3)",
4343
org.eclipse.jetty.security;version="[8,10)",

testsuite/integration-arquillian/test-apps/fuse/customer-app-fuse/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
org.apache.http.impl.cookie.*;version=${apache.httpcomponents.version},
4646
org.apache.http.impl.execchain.*;version=${apache.httpcomponents.version},
4747
org.apache.http.*;version=${apache.httpcomponents.httpcore.version},
48-
javax.servlet.*;version="[2.5,4)",
48+
javax.servlet.*;version="[3.1,5)",
4949
org.keycloak.adapters.authentication;version="${project.version}";resolution:=optional,
5050
org.keycloak.adapters.jetty;version="${project.version}";resolution:=optional,
5151
org.keycloak.adapters;version="${project.version}",

testsuite/integration-arquillian/test-apps/fuse/external-config/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
org.apache.http.impl.cookie.*;version=${apache.httpcomponents.version},
4747
org.apache.http.impl.execchain.*;version=${apache.httpcomponents.version},
4848
org.apache.http.*;version=${apache.httpcomponents.httpcore.version},
49-
javax.servlet.*;version="[2.5,4)",
49+
javax.servlet.*;version="[3.1,5)",
5050
org.keycloak.adapters.jetty;version="${project.version}";resolution:=optional,
5151
org.keycloak.adapters;version="${project.version}",
5252
org.keycloak.constants;version="${project.version}",

testsuite/integration-arquillian/test-apps/fuse/product-app-fuse7-undertow/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
org.apache.cxf.*;version="[2.7,3.3)",
4444
org.keycloak.*;version="${project.version}",
4545
org.keycloak.adapters.authentication;version="${project.version}";resolution:=optional,
46+
javax.servlet.*;version="[3.1,5)",
4647
*;resolution:=optional
4748
</keycloak.osgi.import>
4849
<keycloak.osgi.private>

0 commit comments

Comments
 (0)