You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2018/10/29 12:58:54 UTC

[cxf] branch master updated: upgrade to swagger.v3 2.0.5

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
     new 58e9812  upgrade to swagger.v3 2.0.5
58e9812 is described below

commit 58e9812a84a1a98d1f0699b59a86a147c847cb2f
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Mon Oct 29 20:58:30 2018 +0800

    upgrade to swagger.v3 2.0.5
---
 osgi/karaf/features/pom.xml | 4 ++--
 parent/pom.xml              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osgi/karaf/features/pom.xml b/osgi/karaf/features/pom.xml
index d9105f0..e261612 100644
--- a/osgi/karaf/features/pom.xml
+++ b/osgi/karaf/features/pom.xml
@@ -206,11 +206,11 @@
                                 <descriptor>mvn:org.apache.karaf.features/framework/${cxf.karaf.version}/xml/features</descriptor>
                                 <descriptor>mvn:org.apache.karaf.features/standard/${cxf.karaf.version}/xml/features</descriptor>
                                 <descriptor>mvn:org.apache.karaf.features/spring/${cxf.karaf.version}/xml/features</descriptor>
-								<descriptor>mvn:org.ops4j.pax.web/pax-web-features/6.0.2/xml/features</descriptor>
+				<descriptor>mvn:org.ops4j.pax.web/pax-web-features/6.0.2/xml/features</descriptor>
                                 <descriptor>file:${project.build.directory}/classes/features.xml</descriptor>
                             </descriptors>
                             <distribution>org.apache.karaf.features:framework</distribution>
-                            <javase>1.8</javase>
+                            <javase>9</javase>
                             <framework>
                                 <feature>framework</feature>
                             </framework>
diff --git a/parent/pom.xml b/parent/pom.xml
index 2c15e4f..ebeb2cc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -165,7 +165,7 @@
         <cxf.spring.ldap.version>2.3.2.RELEASE</cxf.spring.ldap.version>
         <cxf.spring.mock>spring-test</cxf.spring.mock>
         <cxf.swagger2.version>1.5.17</cxf.swagger2.version><!-- updating to 1.5.18 will cause systest failures -->
-        <cxf.swagger.v3.version>2.0.0</cxf.swagger.v3.version>
+        <cxf.swagger.v3.version>2.0.5</cxf.swagger.v3.version>
         <cxf.swagger.ui.version>3.19.0</cxf.swagger.ui.version>
         <cxf.tomcat.version>8.0.53</cxf.tomcat.version>
         <cxf.velocity.version>2.0</cxf.velocity.version>
@@ -198,7 +198,7 @@
         <cxf.aries.parser.version>1.3.1</cxf.aries.parser.version> 
         <cxf.aries.version.range>[1.0,2)</cxf.aries.version.range>
         <cxf.osgi.version>5.0.0</cxf.osgi.version>
-        <cxf.karaf.version>4.2.1</cxf.karaf.version>
+        <cxf.karaf.version>4.2.2-SNAPSHOT</cxf.karaf.version>
         <cxf.pax.logging.version>1.6.0</cxf.pax.logging.version>
         <cxf.pax.exam.version>4.12.0</cxf.pax.exam.version>
         <cxf.felix.configadmin.version>1.2.4</cxf.felix.configadmin.version>