libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

[KEYCLOAK-7681] Review pax-web OSGi dependencies

Browse source 
Co-Authored-By: Hynek Mlnarik <hmlnarik@redhat.com>
This commit is contained in:
Grzegorz Grzybek 2018-06-05 09:22:04 +02:00 committed by Hynek Mlnařík
parent 998227ac53
commit 3c9d3c2c04
5 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
adapters/oidc/fuse7/jetty94/pom.xml
View file

@ -36,6 +36,7 @@
</keycloak.osgi.export> </keycloak.osgi.export>
<keycloak.osgi.import> <keycloak.osgi.import>
!org.keycloak.adapters.osgi.jetty94, !org.keycloak.adapters.osgi.jetty94,
org.ops4j.pax.web.*;version="[7.1,9)",
org.keycloak.*;version="${project.version}", org.keycloak.*;version="${project.version}",
*;resolution:=optional *;resolution:=optional
</keycloak.osgi.import> </keycloak.osgi.import>

1
adapters/oidc/fuse7/tomcat8/pom.xml
View file

@ -36,6 +36,7 @@
</keycloak.osgi.export> </keycloak.osgi.export>
<keycloak.osgi.import> <keycloak.osgi.import>
!org.keycloak.adapters.osgi.tomcat, !org.keycloak.adapters.osgi.tomcat,
org.ops4j.pax.web.*;version="[7.1,9)",
org.keycloak.*;version="${project.version}", org.keycloak.*;version="${project.version}",
*;resolution:=optional *;resolution:=optional
</keycloak.osgi.import> </keycloak.osgi.import>

7
adapters/oidc/fuse7/undertow/pom.xml
View file

@ -38,7 +38,7 @@
!org.keycloak.adapters.osgi.undertow, !org.keycloak.adapters.osgi.undertow,
org.keycloak.*;version="${project.version}", org.keycloak.*;version="${project.version}",
org.keycloak.adapters.osgi.*;version="${project.version}", org.keycloak.adapters.osgi.*;version="${project.version}",
org.ops4j.pax.web.*;version="[3.0,8)", org.ops4j.pax.web.*;version="[7.1,9)",
javax.servlet.*;version="[2.5,4)";resolution:=optional, javax.servlet.*;version="[2.5,4)";resolution:=optional,
org.apache.cxf.transport.http;resolution:=optional;version="[3,4)", 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.http_undertow;resolution:=optional;version="[3,4)",
@ -65,11 +65,6 @@
<artifactId>org.osgi.enterprise</artifactId> <artifactId>org.osgi.enterprise</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-runtime</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.ops4j.pax.web</groupId> <groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-spi</artifactId> <artifactId>pax-web-spi</artifactId>

5
adapters/oidc/osgi-adapter/pom.xml
View file

@ -77,11 +77,6 @@
<artifactId>org.osgi.enterprise</artifactId> <artifactId>org.osgi.enterprise</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-runtime</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.ops4j.pax.web</groupId> <groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-api</artifactId> <artifactId>pax-web-api</artifactId>

9
distribution/adapters/osgi/features/src/main/resources/features.xml
View file

@ -68,7 +68,8 @@
<feature name="keycloak-pax-http-jetty" version="${project.version}"> <feature name="keycloak-pax-http-jetty" version="${project.version}">
<details>Keycloak Pax-Web adapter for Jetty 9.4</details> <details>Keycloak Pax-Web adapter for Jetty 9.4</details>
<feature>keycloak-adapter-core</feature> <feature>keycloak-adapter-core</feature>
<feature>keycloak-osgi-adapter</feature> <feature version="[7.1,9)">pax-web-core</feature>
<bundle>mvn:org.keycloak/keycloak-osgi-adapter/${project.version}</bundle>
<bundle>mvn:org.keycloak/keycloak-jetty-adapter-spi/${project.version}</bundle> <bundle>mvn:org.keycloak/keycloak-jetty-adapter-spi/${project.version}</bundle>
<bundle>mvn:org.keycloak/keycloak-jetty-core/${project.version}</bundle> <bundle>mvn:org.keycloak/keycloak-jetty-core/${project.version}</bundle>
<bundle>mvn:org.keycloak/keycloak-jetty94-adapter/${project.version}</bundle> <bundle>mvn:org.keycloak/keycloak-jetty94-adapter/${project.version}</bundle>
@ -79,8 +80,9 @@
<!-- Keycloak adapter for PaxWeb undertow provider --> <!-- Keycloak adapter for PaxWeb undertow provider -->
<feature name="keycloak-pax-http-undertow" version="${project.version}"> <feature name="keycloak-pax-http-undertow" version="${project.version}">
<details>Keycloak Pax-Web adapter for Undertow</details> <details>Keycloak Pax-Web adapter for Undertow</details>
<feature>keycloak-osgi-adapter</feature>
<feature>keycloak-adapter-core</feature> <feature>keycloak-adapter-core</feature>
<feature version="[7.1,9)">pax-web-core</feature>
<bundle>mvn:org.keycloak/keycloak-osgi-adapter/${project.version}</bundle>
<bundle>mvn:org.keycloak/keycloak-undertow-adapter/${project.version}</bundle> <bundle>mvn:org.keycloak/keycloak-undertow-adapter/${project.version}</bundle>
<bundle>mvn:org.keycloak/keycloak-undertow-adapter-spi/${project.version}</bundle> <bundle>mvn:org.keycloak/keycloak-undertow-adapter-spi/${project.version}</bundle>
<bundle>mvn:org.keycloak/keycloak-pax-web-undertow/${project.version}</bundle> <bundle>mvn:org.keycloak/keycloak-pax-web-undertow/${project.version}</bundle>
@ -92,7 +94,8 @@
<feature name="keycloak-pax-http-tomcat" version="${project.version}"> <feature name="keycloak-pax-http-tomcat" version="${project.version}">
<details>Keycloak Pax-Web adapter for Tomcat 8</details> <details>Keycloak Pax-Web adapter for Tomcat 8</details>
<feature>keycloak-adapter-core</feature> <feature>keycloak-adapter-core</feature>
<feature>keycloak-osgi-adapter</feature> <feature version="[7.1,9)">pax-web-core</feature>
<bundle>mvn:org.keycloak/keycloak-osgi-adapter/${project.version}</bundle>
<bundle>mvn:org.keycloak/keycloak-tomcat-core-adapter/${project.version}</bundle> <bundle>mvn:org.keycloak/keycloak-tomcat-core-adapter/${project.version}</bundle>
<bundle>mvn:org.keycloak/keycloak-tomcat-adapter-spi/${project.version}</bundle> <bundle>mvn:org.keycloak/keycloak-tomcat-adapter-spi/${project.version}</bundle>
<bundle>mvn:org.keycloak/keycloak-tomcat8-adapter/${project.version}</bundle> <bundle>mvn:org.keycloak/keycloak-tomcat8-adapter/${project.version}</bundle>