cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cxf git commit: CXF-7164: Support tracing using OpenZipkin Brave. Replaced Glassfish with Apache Johnzon as JSR-353 implementation. Glassfish bundle does not play with OSGi well.
Date Sun, 15 Jan 2017 21:16:03 GMT
Repository: cxf
Updated Branches:
  refs/heads/master e636c50b0 -> 06bfa1334


CXF-7164: Support tracing using OpenZipkin Brave. Replaced Glassfish with Apache Johnzon as
JSR-353 implementation. Glassfish bundle does not play with OSGi well.


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/06bfa133
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/06bfa133
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/06bfa133

Branch: refs/heads/master
Commit: 06bfa1334e86ebcf8e19974708d4aa165296edb9
Parents: e636c50
Author: reta <drreta@gmail.com>
Authored: Sun Jan 15 16:15:41 2017 -0500
Committer: reta <drreta@gmail.com>
Committed: Sun Jan 15 16:15:41 2017 -0500

----------------------------------------------------------------------
 .../main/release/samples/jax_rs/tracing_brave_osgi/pom.xml    | 5 +++--
 .../resources/META-INF/services/javax.json.spi.JsonProvider   | 1 +
 osgi/karaf/features/src/main/resources/features.xml           | 2 +-
 parent/pom.xml                                                | 7 +++++++
 4 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/06bfa133/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/pom.xml
index 85f7550..9421dff 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/pom.xml
@@ -70,8 +70,8 @@
             <artifactId>javax.json-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>javax.json</artifactId>
+            <groupId>org.apache.johnzon</groupId>
+            <artifactId>johnzon-core</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-httpclient</groupId>
@@ -104,6 +104,7 @@
                             org.apache.cxf.tracing.brave.jaxrs,
                             org.osgi.service.blueprint,
                             javax.annotation;version="[1.2,2)",
+                            org.apache.johnzon.core,
                             *
                         </Import-Package>
                         <Export-Package>

http://git-wip-us.apache.org/repos/asf/cxf/blob/06bfa133/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/resources/META-INF/services/javax.json.spi.JsonProvider
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/resources/META-INF/services/javax.json.spi.JsonProvider
b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/resources/META-INF/services/javax.json.spi.JsonProvider
new file mode 100644
index 0000000..10c8c57
--- /dev/null
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/resources/META-INF/services/javax.json.spi.JsonProvider
@@ -0,0 +1 @@
+org.apache.johnzon.core.JsonProviderImpl
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cxf/blob/06bfa133/osgi/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index c9c4f99..a7da8a9 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -278,7 +278,7 @@
     </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 start-level="35">mvn:org.glassfish/javax.json/${cxf.glassfish.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}">
         <bundle start-level="35">mvn:io.zipkin.java/zipkin/1.16.2</bundle>

http://git-wip-us.apache.org/repos/asf/cxf/blob/06bfa133/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 37a422b..cdf770f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -172,6 +172,7 @@
         <cxf.osgi.validation.api.version>1.1.0</cxf.osgi.validation.api.version>
         <cxf.hibernate.validator.version>5.2.2.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.javax.el.version>3.0.0</cxf.javax.el.version>
         <!-- various OSGi related versions -->
         <cxf.aries.version>1.0.0</cxf.aries.version>
@@ -948,6 +949,12 @@
                 <optional>true</optional>
             </dependency>
             <dependency>
+                <groupId>org.apache.johnzon</groupId>
+                <artifactId>johnzon-core</artifactId>
+                <version>${cxf.johnzon.version}</version>
+                <optional>true</optional>
+            </dependency>
+            <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-jdk14</artifactId>
                 <version>${cxf.slf4j.version}</version>


Mime
View raw message