KEYCLOAK-10914 Cannot install artifact due to unresolved constraint in bundle in fuse test-apps

This commit is contained in:
vramik 2019-07-23 15:30:09 +02:00 committed by Hynek Mlnařík
parent 4571f65d1e
commit 215331e947
5 changed files with 10 additions and 28 deletions

View file

@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>fuse-example-cxf-jaxrs-fuse7-undertow</artifactId>
<packaging>bundle</packaging>
<name>CXF JAXRS Example - Secured in Karaf/Fuse 7.0 on Undertow</name>
<name>CXF JAXRS Example - Secured in Karaf/Fuse 7 on Undertow</name>
<properties>
<keycloak.osgi.export>
@ -38,7 +38,7 @@
META-INF.cxf.osgi;version="[2.7,3.3)";resolution:=optional,
org.apache.cxf.transport.http;version="[2.7,3.3)",
org.apache.cxf.*;version="[2.7,3.3)",
com.fasterxml.jackson.jaxrs.json;version="${jackson.version}",
com.fasterxml.jackson.jaxrs.json;version="[2.8,3)",
org.keycloak.*;version="${project.version}",
*;resolution:=optional
</keycloak.osgi.import>

View file

@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>fuse-example-cxf-jaxws-fuse7-undertow</artifactId>
<packaging>bundle</packaging>
<name>CXF JAXWS Example - Secured in Karaf/Fuse 7.0 on Undertow</name>
<name>CXF JAXWS Example - Secured in Karaf/Fuse 7 on Undertow</name>
<properties>
<keycloak.osgi.export>
@ -35,8 +35,8 @@
<keycloak.osgi.import>
javax.jws;resolution:=optional,
javax.wsdl,
javax.xml.bind,
javax.xml.bind.annotation,
javax.xml.bind;version="[2.2,3)",
javax.xml.bind.annotation;version="[2.2,3)",
javax.xml.namespace,
javax.xml.ws,
META-INF.cxf;version="[2.7,3.3)",

View file

@ -35,8 +35,8 @@
<keycloak.osgi.import>
javax.jws;resolution:=optional,
javax.wsdl,
javax.xml.bind,
javax.xml.bind.annotation,
javax.xml.bind;version="[2.2,3)",
javax.xml.bind.annotation;version="[2.2,3)",
javax.xml.namespace,
javax.xml.ws,
META-INF.cxf;version="[2.7,3.2)",

View file

@ -56,22 +56,4 @@
<bundle>mvn:org.keycloak.testsuite/fuse-example-cxf-jaxrs/${project.version}</bundle>
</feature>
<!-- The difference are keycloak-jetty8-adapter and camel-jetty feature -->
<feature name="keycloak-fuse-6.2-example" version="${project.version}">
<details>The keycloak fuse example</details>
<feature>war</feature>
<feature>camel</feature>
<feature>camel-jetty</feature>
<feature>cxf</feature>
<feature>keycloak</feature>
<feature>keycloak-jetty8-adapter</feature>
<bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson.version}</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson.version}</bundle>
<bundle>mvn:org.keycloak.testsuite/fuse-example-product-portal/${project.version}</bundle>
<bundle>mvn:org.keycloak.testsuite/fuse-example-customer-portal/${project.version}/war</bundle>
<bundle>mvn:org.keycloak.testsuite/fuse-example-camel-endpoint/${project.version}</bundle>
<bundle>mvn:org.keycloak.testsuite/fuse-example-cxf-jaxws/${project.version}</bundle>
<bundle>mvn:org.keycloak.testsuite/fuse-example-cxf-jaxrs/${project.version}</bundle>
</feature>
</features>

View file

@ -27,15 +27,15 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>fuse-example-product-portal-fuse7-undertow</artifactId>
<packaging>bundle</packaging>
<name>Product Portal - Secured in Karaf/Fuse 7.0 on Undertow</name>
<name>Product Portal - Secured in Karaf/Fuse 7 on Undertow</name>
<properties>
<keycloak.osgi.export>
</keycloak.osgi.export>
<keycloak.osgi.import>
javax.wsdl,
javax.xml.bind,
javax.xml.bind.annotation,
javax.xml.bind;version="[2.2,3)",
javax.xml.bind.annotation;version="[2.2,3)",
javax.xml.namespace,
javax.xml.ws,
META-INF.cxf;version="[2.7,3.3)",