[cxf] branch master updated: CXF-7950: Upgrading Apache Johnzon to 1.1.11

[reta]

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

reta 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 3671c30  CXF-7950: Upgrading Apache Johnzon to 1.1.11
3671c30 is described below

commit 3671c30616bec8e08f5970481cad77d5c17ef437
Author: reta <drr...@gmail.com>
AuthorDate: Tue Apr 9 22:02:38 2019 -0400

    CXF-7950: Upgrading Apache Johnzon to 1.1.11
---
 osgi/karaf/features/src/main/resources/features.xml |  4 +++-
 parent/pom.xml                                      | 17 +++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/osgi/karaf/features/src/main/resources/features.xml 
b/osgi/karaf/features/src/main/resources/features.xml
index 8dbc6b4..ae9936a 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -290,7 +290,9 @@
         
<bundle>wrap:mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${cxf.jackson.version}$overwrite=merge&amp;Import-Package=javax.ws.rs*;version="[2.0,3)",com.fasterxml.jackson.module.jaxb;resolution:=optional;version="[2.8,3)",com.fasterxml.jackson*;version="[2.8,3)"</bundle>
     </feature>
     <feature name="cxf-jsr-json" version="${project.version}">
-        <bundle 
start-level="35">mvn:javax.json/javax.json-api/${cxf.json.api.version}</bundle>
+        <bundle dependency="true" 
start-level="30">mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/${cxf.aries.fly.version}</bundle>
+        <bundle dependency="true" 
start-level="35">mvn:javax.json/javax.json-api/${cxf.json.api.version}</bundle>
+        <bundle dependency="true" 
start-level="35">mvn:org.apache.geronimo.specs/geronimo-json_1.1_spec/${cxf.geronimo.json.version}</bundle>
         <bundle 
start-level="35">mvn:org.apache.johnzon/johnzon-core/${cxf.johnzon.version}</bundle>
     </feature>
     <feature name="cxf-tracing-brave" version="${project.version}">
diff --git a/parent/pom.xml b/parent/pom.xml
index c7d9363..313e615 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -117,6 +117,7 @@
         <cxf.geronimo.jta.version>1.1.1</cxf.geronimo.jta.version>
         
<cxf.geronimo.j2ee.management.version>1.0.1</cxf.geronimo.j2ee.management.version>
         <cxf.geronimo.jpa.version>1.0</cxf.geronimo.jpa.version>
+        <cxf.geronimo.json.version>1.2</cxf.geronimo.json.version>
         <cxf.openjpa.version>2.4.3</cxf.openjpa.version>
         
<cxf.geronimo.transaction.version>3.1.4</cxf.geronimo.transaction.version>
         <cxf.jasypt.bundle.version>1.9.2_1</cxf.jasypt.bundle.version>
@@ -185,15 +186,16 @@
         
<cxf.validation.api.package.version>[1.0.0,2)</cxf.validation.api.package.version>
         <cxf.cdi.api.version>1.2</cxf.cdi.api.version>
         <cxf.cda.api.osgi.range>[1.1,2)</cxf.cda.api.osgi.range>
-        <cxf.json.api.version>1.0</cxf.json.api.version>
+        <cxf.json.api.version>1.1.4</cxf.json.api.version>
         <cxf.jboss.weld.version>2.4.8.Final</cxf.jboss.weld.version>
         <cxf.jboss.logging.version>3.3.0.Final</cxf.jboss.logging.version>
         
<cxf.hibernate.validator.version>5.2.5.Final</cxf.hibernate.validator.version>
         <cxf.glassfish.json.version>1.0.4</cxf.glassfish.json.version>
-        <cxf.johnzon.version>1.0.0</cxf.johnzon.version>
+        <cxf.johnzon.version>1.1.11</cxf.johnzon.version>
         <cxf.javax.el.version>3.0.0</cxf.javax.el.version>
         
<cxf.servicemix.javax.el.version>3.0.0_1</cxf.servicemix.javax.el.version>
         <!-- various OSGi related versions -->
+        <cxf.aries.fly.version>1.2</cxf.aries.fly.version>
         <cxf.aries.version>1.0.1</cxf.aries.version>
         <cxf.aries.parser.version>1.3.1</cxf.aries.parser.version> 
         <cxf.aries.version.range>[1.0,2)</cxf.aries.version.range>
@@ -1598,6 +1600,12 @@
                 <optional>true</optional>
             </dependency>
             <dependency>
+                <groupId>org.apache.johnzon</groupId>
+                <artifactId>johnzon-jsonb</artifactId>
+                <version>${cxf.johnzon.version}</version>
+                <optional>true</optional>
+            </dependency>
+            <dependency>
                 <groupId>org.eclipse.microprofile.rest.client</groupId>
                 <artifactId>microprofile-rest-client-api</artifactId>
                 <version>${cxf.microprofile.rest.client.version}</version>
@@ -2181,6 +2189,11 @@
                 <version>1.0.1</version>
             </dependency>
             <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-json_1.1_spec</artifactId>
+                <version>${cxf.geronimo.json.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.geronimo.components</groupId>
                 <artifactId>geronimo-transaction</artifactId>
                 <version>${cxf.geronimo.transaction.version}</version>