Fix #126: Karaf feature should contain only jersey-min, not jersey-all

hstaudacher · Dec 27, 2015 · 4a0a5d4 · 4a0a5d4
1 parent 3c8ab40
commit 4a0a5d4
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 10 deletions.
diff --git a/examples/karaf-integration/features/pom.xml b/examples/karaf-integration/features/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.eclipsesource.jaxrs</groupId>
         <artifactId>osgi-jax-rs-connector-pom</artifactId>
-        <version>5.0</version>
+        <version>5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/karaf-integration/features/src/main/resources/features.xml b/examples/karaf-integration/features/src/main/resources/features.xml
@@ -2,7 +2,7 @@
 
     <feature name="jax-rs-connector" version="${jax-rs-publisher.version}" resolver="(obr)">
         <bundle dependency="true">mvn:javax.servlet/javax.servlet-api/3.1.0</bundle>
-        <bundle dependency="true">mvn:com.eclipsesource.jaxrs/jersey-all/${jax-rs-jersey-all.version}</bundle>
+        <bundle dependency="true">mvn:com.eclipsesource.jaxrs/jersey-min/${jax-rs-jersey-min.version}</bundle>
         <bundle dependency="true">mvn:com.eclipsesource.jaxrs/consumer/${jax-rs-consumer.version}</bundle>
         <bundle>mvn:com.eclipsesource.jaxrs/publisher/${jax-rs-publisher.version}</bundle>
     </feature>
@@ -29,5 +29,10 @@
     <feature name="jax-rs-provider-sse" version="${jax-rs-providers.version}">
         <bundle>mvn:com.eclipsesource.jaxrs/provider-sse/${jax-rs-providers.version}</bundle>
     </feature>
+
+    <feature name="jax-rs-provider-swagger" version="${jax-rs-providers.swagger.version}">
+        <bundle dependency="true">mvn:com.eclipsesource.jaxrs/swagger-all/${jax-rs-swagger-all.version}</bundle>
+        <bundle>mvn:com.eclipsesource.jaxrs/provider-swagger/${jax-rs-providers.swagger.version}</bundle>        
+    </feature>
 
 </features>
diff --git a/examples/karaf-integration/itest/pom.xml b/examples/karaf-integration/itest/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>osgi-jax-rs-connector-pom</artifactId>
         <groupId>com.eclipsesource.jaxrs</groupId>
-        <version>4.2-SNAPSHOT</version>
+        <version>5.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/karaf-integration/jax-rs-sample/pom.xml b/examples/karaf-integration/jax-rs-sample/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>osgi-jax-rs-connector-pom</artifactId>
         <groupId>com.eclipsesource.jaxrs</groupId>
-        <version>4.2-SNAPSHOT</version>
+        <version>5.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/karaf-integration/pom.xml b/examples/karaf-integration/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.eclipsesource.jaxrs</groupId>
     <artifactId>osgi-jax-rs-connector-pom</artifactId>
     <packaging>pom</packaging>
-    <version>5.0</version>
+    <version>5.3</version>
 
     <modules>
         <module>features</module>
@@ -24,11 +24,13 @@
 
     <properties>
         <!-- Change jax-rs connector versions as you like, see available versions here: http://search.maven.org/#search%7Cga%7C1%7Ccom.eclipsesource.jaxrs --> 
-        <jax-rs-publisher.version>5.0</jax-rs-publisher.version>
-        <jax-rs-consumer.version>5.0</jax-rs-consumer.version>
-        <jax-rs-jersey-all.version>2.18</jax-rs-jersey-all.version>
+        <jax-rs-publisher.version>5.3</jax-rs-publisher.version>
+        <jax-rs-consumer.version>5.3</jax-rs-consumer.version>
+        <jax-rs-jersey-min.version>2.22.1</jax-rs-jersey-min.version>
         <jax-rs-providers.version>2.2</jax-rs-providers.version>
         <jax-rs-providers.gson.version>2.3</jax-rs-providers.gson.version>
+        <jax-rs-providers.swagger.version>1.0</jax-rs-providers.swagger.version>
+        <jax-rs-swagger-all.version>1.5.5</jax-rs-swagger-all.version>
 
         <lombok.version>1.14.8</lombok.version>
         <javaee-web-api.version>7.0</javaee-web-api.version>
@@ -81,8 +83,8 @@
             </dependency>
             <dependency>
                 <groupId>com.eclipsesource.jaxrs</groupId>
-                <artifactId>jersey-all</artifactId>
-                <version>${jax-rs-jersey-all.version}</version>
+                <artifactId>jersey-min</artifactId>
+                <version>${jax-rs-jersey-min.version}</version>
             </dependency>
 
             <dependency>
@@ -110,6 +112,16 @@
                 <artifactId>provider-sse</artifactId>
                 <version>${jax-rs-providers.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.eclipsesource.jaxrs</groupId>
+                <artifactId>provider-swagger</artifactId>
+                <version>${jax-rs-providers.swagger.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.eclipsesource.jaxrs</groupId>
+                <artifactId>swagger-all</artifactId>
+                <version>${jax-rs-swagger-all.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>junit</groupId>