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

(cxf) branch 3.6.x-fixes updated (8aebeebbb8 -> f8eb1117e3)

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

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


    from 8aebeebbb8 Recording .gitmergeinfo Changes
     new 57f54afdb7 Update Zipkin to 2.26.0
     new 57ca435cee Add Windows builds to GA workflow (#1326)
     new f8eb1117e3 Recording .gitmergeinfo Changes

The 3 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:
 .github/workflows/pull-request-build.yml | 9 ++++++++-
 .gitmergeinfo                            | 2 ++
 parent/pom.xml                           | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)


(cxf) 02/03: Add Windows builds to GA workflow (#1326)

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 57ca435ceee7e1b2ee71b0dd6ffd0bc4415647e0
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Dec 28 17:06:33 2023 -0500

    Add Windows builds to GA workflow (#1326)
    
    (cherry picked from commit b90c3f4cf5b87cd210a90704bbbbb5f97b90779f)
---
 .github/workflows/pull-request-build.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pull-request-build.yml b/.github/workflows/pull-request-build.yml
index 0124ccdad1..f6c8b63956 100644
--- a/.github/workflows/pull-request-build.yml
+++ b/.github/workflows/pull-request-build.yml
@@ -9,7 +9,10 @@ permissions:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [windows-latest, ubuntu-latest] 
     permissions:
       contents: read  
       pull-requests: read
@@ -22,7 +25,11 @@ jobs:
           java-version: '11'
           distribution: 'temurin'
           cache: maven
+      - name: Build with Apache Maven (Windows)
+        if: ${{ matrix.os == 'windows-latest' }} 
+        run: mvn -U clean install -fae -B -Peverything
       - name: Build with Apache Maven
+        if: ${{ matrix.os != 'windows-latest' }} 
         run: mvn -U clean install -Djava.awt.headless=true -fae -B -Peverything
     env: 
        MAVEN_OPTS: "-Xmx1024M"


(cxf) 01/03: Update Zipkin to 2.26.0

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 57f54afdb73088d8146cf64087b935fc0b9529fb
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Fri Dec 29 13:53:47 2023 -0500

    Update Zipkin to 2.26.0
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 5718fe6035..ee70e062c8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -88,7 +88,7 @@
         <cxf.bcprov.version>1.77</cxf.bcprov.version>
         <cxf.brave.reporter.version>2.17.1</cxf.brave.reporter.version>
         <cxf.brave.version>5.17.0</cxf.brave.version>
-        <cxf.brave.zipkin.version>2.25.2</cxf.brave.zipkin.version>
+        <cxf.brave.zipkin.version>2.26.0</cxf.brave.zipkin.version>
         <cxf.cda.api.osgi.range>[1.1,2)</cxf.cda.api.osgi.range>
         <cxf.cdi.api.version>2.0.2</cxf.cdi.api.version>
         <cxf.classgraph.version>4.8.25</cxf.classgraph.version>


(cxf) 03/03: Recording .gitmergeinfo Changes

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit f8eb1117e349945430fe10a21e6219aa12adc8bb
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Fri Dec 29 13:54:26 2023 -0500

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 60135d5c63..3cafcf1ba6 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -673,6 +673,7 @@ M b7d7bbb6974a0de2a9096087ffe6fbc696a19e1b
 M b7ef17faca66606dd5da5dc7ab60dd9085f172c6
 M b838c3ff3a155d33d90a82515d0bc084b303df4a
 M b86699f2ae12722273638a580d9373f40ebc9c18
+M b90c3f4cf5b87cd210a90704bbbbb5f97b90779f
 M b9569dad4a4636af572b23414a9ee8a67c2daee6
 M b9634cbd2e8adf7ad1186c2471d396dd2119d388
 M bbe672aa5e6bd6916cff39b506e267695f6b9e7c
@@ -831,6 +832,7 @@ M f66d6216e6c62423f61351ba2dc65a0e5aabfb6b
 M f72118971428a059b94f3ee4c0730c95d5f1c192
 M f756c887ffd822f416d530a780d7c03f612b44b8
 M f8c6de43e8fd66ce11d8c8d15fa709f5e4020921
+M f8c8dabe62b2ce695f1923cd027a016bbcedb809
 M f8d3ff37be721f773723ee820761fe266af071b6
 M f9e5c574400148a87c7daef4f0387950faa47795
 M fa641eaf4a8b60789c9396ab3d77d8d1daab6550