cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject [cxf-dosgi] branch master updated: [DOSGI-274] Upgrade to CXF 3.2.0
Date Fri, 15 Sep 2017 13:32:55 GMT
This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git


The following commit(s) were added to refs/heads/master by this push:
     new 25a2ab0  [DOSGI-274] Upgrade to CXF 3.2.0
25a2ab0 is described below

commit 25a2ab05b4ff2a2b1b741bb4d64fd1535b3bf473
Author: Christian Schneider <chris@die-schneider.net>
AuthorDate: Fri Sep 15 15:32:40 2017 +0200

    [DOSGI-274] Upgrade to CXF 3.2.0
---
 distribution/multi-bundle/pom.xml                                    | 5 +++++
 distribution/repository/pom.xml                                      | 4 ++--
 parent/pom.xml                                                       | 2 +-
 .../org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java     | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/distribution/multi-bundle/pom.xml b/distribution/multi-bundle/pom.xml
index c856e65..f6db721 100644
--- a/distribution/multi-bundle/pom.xml
+++ b/distribution/multi-bundle/pom.xml
@@ -183,6 +183,11 @@
 			<artifactId>guava</artifactId>
 			<version>20.0</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.6</version>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/distribution/repository/pom.xml b/distribution/repository/pom.xml
index c6bea15..164f198 100644
--- a/distribution/repository/pom.xml
+++ b/distribution/repository/pom.xml
@@ -53,8 +53,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jsr339-api-2.0.1</artifactId>
-            <version>2.6.0</version>
+            <artifactId>org.apache.servicemix.specs.jaxrs-api-2.1</artifactId>
+            <version>2.9.1</version>
         </dependency>
     </dependencies>
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 2c6ab61..0ec9007 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -30,7 +30,7 @@
         <osgi.version>6.0.0</osgi.version>
         <osgi.compendium.version>5.0.0</osgi.compendium.version>
         <aries.rsa.version>1.11.0</aries.rsa.version>
-        <cxf.version>3.1.12</cxf.version>
+        <cxf.version>3.2.0</cxf.version>
         <felix.version>5.6.8</felix.version>
         <zookeeper.version>3.4.8</zookeeper.version>
         <servlet.version>3.0</servlet.version>
diff --git a/samples/rest/impl/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
b/samples/rest/impl/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
index c4171bd..e4dc61d 100644
--- a/samples/rest/impl/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
+++ b/samples/rest/impl/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
@@ -88,7 +88,7 @@ public class TaskResourceImpl implements TaskResource, IntentsProvider {
         swagger.setDescription("Sample jaxrs application to organize taks");
         swagger.setTitle("Tasks sample");
         swagger.setUsePathBasedConfig(true); // Necessary for OSGi
-        swagger.setScan(false);
+        // swagger.setScan(false); // Must be set for cxf < 3.2.x
         swagger.setPrettyPrint(true);
         swagger.setSupportSwaggerUi(true);
         return swagger;

-- 
To stop receiving notification emails like this one, please contact
['"commits@cxf.apache.org" <commits@cxf.apache.org>'].

Mime
View raw message