[cxf] branch 3.3.x-fixes updated (2793826 -> f512502)

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[cxf] branch 3.3.x-fixes updated (2793826 -> f512502)

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

reta pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.


    from 2793826  Update to RxJava3 3.0.7
     new 82ddde6  Updating to latest Brave 5.12.6 / Brave Reporter 2.15.2
     new f512502  Recording .gitmergeinfo Changes

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitmergeinfo                                       | 7 +++++++
 osgi/karaf/features/src/main/resources/features.xml | 1 +
 parent/pom.xml                                      | 6 +++---
 3 files changed, 11 insertions(+), 3 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[cxf] 01/02: Updating to latest Brave 5.12.6 / Brave Reporter 2.15.2

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

reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 82ddde6ca09a1678efc6b954c0ea9ddfae81689c
Author: reta <[hidden email]>
AuthorDate: Sun Sep 13 22:46:19 2020 -0400

    Updating to latest Brave 5.12.6 / Brave Reporter 2.15.2
   
    (cherry picked from commit de540657667d3e787a41c1e34d045eb4b37b183e)
   
    # Conflicts:
    # parent/pom.xml
---
 osgi/karaf/features/src/main/resources/features.xml | 1 +
 parent/pom.xml                                      | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index 1baead1..5826a0b 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -297,6 +297,7 @@
         <feature version="${project.version}">cxf-core</feature>
         <bundle start-level="35">mvn:io.zipkin.zipkin2/zipkin/${cxf.brave.zipkin.version}</bundle>
         <bundle start-level="35">mvn:io.zipkin.reporter2/zipkin-reporter/${cxf.brave.reporter.version}</bundle>
+        <bundle start-level="35">mvn:io.zipkin.reporter2/zipkin-reporter-brave/${cxf.brave.reporter.version}</bundle>
         <bundle start-level="35">mvn:io.zipkin.brave/brave/${cxf.brave.version}</bundle>
         <bundle start-level="35">mvn:io.zipkin.brave/brave-instrumentation-http/${cxf.brave.version}</bundle>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-integration-tracing-brave/${project.version}</bundle>
diff --git a/parent/pom.xml b/parent/pom.xml
index c5f60e7..c7e0316 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -88,9 +88,9 @@
         <cxf.atmosphere.version.range>[2.4,3.0)</cxf.atmosphere.version.range>
         <cxf.atmosphere.version>2.5.15</cxf.atmosphere.version>
         <cxf.bcprov.version>1.66</cxf.bcprov.version>
-        <cxf.brave.reporter.version>2.12.1</cxf.brave.reporter.version>
-        <cxf.brave.version>5.10.1</cxf.brave.version>
-        <cxf.brave.zipkin.version>2.19.3</cxf.brave.zipkin.version>
+        <cxf.brave.reporter.version>2.15.2</cxf.brave.reporter.version>
+        <cxf.brave.version>5.12.6</cxf.brave.version>
+        <cxf.brave.zipkin.version>2.21.7</cxf.brave.zipkin.version>
         <cxf.cda.api.osgi.range>[1.1,2)</cxf.cda.api.osgi.range>
         <cxf.cdi.api.version>1.2</cxf.cdi.api.version>
         <cxf.classgraph.version>4.6.32</cxf.classgraph.version>

Reply | Threaded
Open this post in threaded view
|

[cxf] 02/02: Recording .gitmergeinfo Changes

reta
In reply to this post by reta
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit f512502036638873f17c77887d256c60d78626ec
Author: reta <[hidden email]>
AuthorDate: Thu Oct 8 20:28:23 2020 -0400

    Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 920c9d5..e93ca37 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -381,6 +381,7 @@ M 09ddfdeaef6f32537dba23fa6d7ef36992b3217b
 M 10251d33f0f379a5bebc640466b639382cbe42bb
 M 113e426f6b717925736433fe04a1b72f801dd574
 M 12d2f091afde535edab04e56c9df026cc9aad743
+M 147a6b416bdfa52b0dace0684f0b83d6a7561ce2
 M 160f50ed9bd9391b61417716b3a67653c9e81a98
 M 169be66c11851d723e4a8d93f752e0b3dff1fa60
 M 16d285838dc2209ca84af21723478f199403c2b7
@@ -402,7 +403,9 @@ M 336d49d4e88641a6ffaf757185ff0ff93473322c
 M 33abf4131ccc46b4027dbbba1c0347445473c1ea
 M 375b065fa6c6fdc73b2d137654f5b60cc3464793
 M 3b119ca6630f1384b93cd718d0cd95ccabc81e91
+M 3b21d2ba746fb1a78009f271f71eb0c2063e7430
 M 3b851e904021f5cf9550df82c36ac445fd0efc30
+M 3cadca3cf0df538934806297bf2d904d01f90472
 M 3dfe11c866073ff93951dac2b94e0f8e8e464b27
 M 464e41a12dea11a00c86a370b31d7a7f009cb8e9
 M 4699995c6ef392a98615382a5824dda0d1bbe9bf
@@ -434,6 +437,7 @@ M 7a655b49fd6d432127a55b38f15c1212f7064196
 M 7aa6e0a402b8ce7dfff8a931a507b884d7152cea
 M 7b50181ebc445bb84d3463b284643432399bc0f8
 M 7c6bf1a843f2d4860d1bd7541139911ad47c7964
+M 7c6c2ed277fc678d8c2485a8e661cb44eb6a4d11
 M 7cfc8d07e1175c35877e7368f020db0749a78fab
 M 7e1bc67acf02fe6049a4bfb7e13fe6933e618ae8
 M 7ef814556d727c147d6f625cbb1170edfd24a752
@@ -461,11 +465,13 @@ M a8fcf81a7a7f06a9c5ffb75cbe372b841f4ba38c
 M a9eb350f7cc28347ffeb7a8af44ba661531429f1
 M aa995675095ca648c1458cb8bf82c357160dfe16
 M aabf37788e571426e70250e7a62c7f4502e4d6e9
+M aaf6d041f6d0671a08f38133bfd5196f9ee8ad0b
 M aefdc0759e30cb44d1729f08d1f31ff516a14e03
 M b70a3916daf64c15689a30e0a77bdb4c9dbaead4
 M b84270df1eb3a92b9d7e05dfd7231b0580f7bb90
 M b899a64b3298afc2ced04dae7955f82f29a5cd01
 M b9732e5a2d4cead834af8246a35b863aa7b8c811
+M b9c2379c51b236b3cf09e2f7bda3ebd0f8450474
 M bbf08b76836c3d4c592d91ee2039317332599b8e
 M bf1b85003e89c4b3e28384f0de476cf0e5b1af12
 M c1b729ea9f0c43e6560099dbc427751fe33ee088
@@ -481,6 +487,7 @@ M d5b612c220bab496c3dab1731e56b3fea36c1b07
 M d8619b13cd9ff375590946c1349f6fe374959f30
 M d875ceee917237f5c344df989947aff025d45d4f
 M de221efcb5539d4b99d8948cdc37e72d8362aa6a
+M de540657667d3e787a41c1e34d045eb4b37b183e
 M de817963ee76778478413917f71aa8e62e221b11
 M e1b81269089d6e7cb53e949a9fde629d37bce421
 M e38fc4aa14d7741369de5d027b30e52def3a0549