[cxf] branch CXF-7601_microProfileOpenApi updated: Upgrading Apache Johnzon dependencies to 1.1.11

[reta]

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

reta pushed a commit to branch CXF-7601_microProfileOpenApi
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/CXF-7601_microProfileOpenApi 
by this push:
     new 9427d6f  Upgrading Apache Johnzon dependencies to 1.1.11
9427d6f is described below

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

    Upgrading Apache Johnzon dependencies to 1.1.11
---
 .../jax_rs/description_openapi_microprofile_spring/pom.xml    |  1 -
 osgi/karaf/features/src/main/resources/features.xml           |  4 +++-
 parent/pom.xml                                                | 11 +++++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git 
a/distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/pom.xml
 
b/distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/pom.xml
index f44cbe6..f4734b2 100644
--- 
a/distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/pom.xml
+++ 
b/distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/pom.xml
@@ -81,7 +81,6 @@
         <dependency>
             <groupId>org.apache.johnzon</groupId>
             <artifactId>johnzon-jsonb</artifactId>
-            <version>1.1.11</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
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 faf5890..3f6d0e1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -188,15 +188,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>
@@ -1602,6 +1603,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>