From 215331e947d48d51832fa14de821f4d2b6c23a46 Mon Sep 17 00:00:00 2001
From: vramik <vramik@redhat.com>
Date: Tue, 23 Jul 2019 15:30:09 +0200
Subject: [PATCH] KEYCLOAK-10914 Cannot install artifact due to unresolved
 constraint in bundle in fuse test-apps

---
 .../fuse/cxf-jaxrs-fuse7-undertow/pom.xml      |  4 ++--
 .../fuse/cxf-jaxws-fuse7-undertow/pom.xml      |  6 +++---
 .../test-apps/fuse/cxf-jaxws/pom.xml           |  4 ++--
 .../features/src/main/resources/features.xml   | 18 ------------------
 .../fuse/product-app-fuse7-undertow/pom.xml    |  6 +++---
 5 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs-fuse7-undertow/pom.xml b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs-fuse7-undertow/pom.xml
index 3e1823b98e..64230afbea 100755
--- a/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs-fuse7-undertow/pom.xml
+++ b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs-fuse7-undertow/pom.xml
@@ -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>
diff --git a/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws-fuse7-undertow/pom.xml b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws-fuse7-undertow/pom.xml
index d2425978e6..03d286bc9a 100755
--- a/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws-fuse7-undertow/pom.xml
+++ b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws-fuse7-undertow/pom.xml
@@ -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)",
diff --git a/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws/pom.xml b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws/pom.xml
index deb60f0b7d..ec9bb2ef96 100755
--- a/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws/pom.xml
+++ b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws/pom.xml
@@ -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)",
diff --git a/testsuite/integration-arquillian/test-apps/fuse/features/src/main/resources/features.xml b/testsuite/integration-arquillian/test-apps/fuse/features/src/main/resources/features.xml
index 5ab566c4c2..e73ccc38cc 100644
--- a/testsuite/integration-arquillian/test-apps/fuse/features/src/main/resources/features.xml
+++ b/testsuite/integration-arquillian/test-apps/fuse/features/src/main/resources/features.xml
@@ -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>
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 9c3f868384..014363c4ad 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
@@ -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)",