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 2025/11/04 18:17:08 UTC

(cxf) branch 3.6.x-fixes updated (68db9b2cd5 -> 9bf364f686)

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 68db9b2cd5 fix certs on 3.6.x branch
     new e8dfd35b41 Bump github/codeql-action from 4.31.0 to 4.31.2 (#2699)
     new 7b50f9ef15 Bump org.webjars:swagger-ui from 5.30.0 to 5.30.1 (#2701)
     new b4080ffe6c Recording .gitmergeinfo Changes
     new 9bf364f686 Recording .gitmergeinfo Changes

The 4 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/codeql-analysis.yml         | 4 ++--
 .gitmergeinfo                                 | 4 ++++
 distribution/src/main/release/samples/pom.xml | 2 +-
 parent/pom.xml                                | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)


(cxf) 04/04: 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 9bf364f686f5c6bf78f1f08eb22a6ce9d74c8fbe
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Nov 4 13:16:55 2025 -0500

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index c4c429b25f..af7f546727 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1026,6 +1026,7 @@ M 72152dd71f2884d57709ddaf392a79d2f78a91e1
 M 721be51dbd47e5db3c8bb7ac5898bafb78681517
 M 7220de723cabf2b8b5d403337c7aa9d0c7da8dac
 M 7226804d39d494a3229319fcc85a95173f8fec00
+M 7231334e37f30da6e5fc8fc8eabb1b2e5eaf171d
 M 732b168c9003c3bb7fe113c92287efb5cd42d10b
 M 7331c6dac952ff347008925ffd6a30a985b9e9df
 M 7348591d44cfa91244dea299bd698c8b908eac01


(cxf) 02/04: Bump org.webjars:swagger-ui from 5.30.0 to 5.30.1 (#2701)

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 7b50f9ef1588b5229309231edb357be1b738158d
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Nov 3 10:53:19 2025 -0500

    Bump org.webjars:swagger-ui from 5.30.0 to 5.30.1 (#2701)
    
    Bumps [org.webjars:swagger-ui](https://github.com/swagger-api/swagger-ui) from 5.30.0 to 5.30.1.
    - [Release notes](https://github.com/swagger-api/swagger-ui/releases)
    - [Changelog](https://github.com/swagger-api/swagger-ui/blob/master/.releaserc)
    - [Commits](https://github.com/swagger-api/swagger-ui/compare/v5.30.0...v5.30.1)
    
    ---
    updated-dependencies:
    - dependency-name: org.webjars:swagger-ui
      dependency-version: 5.30.1
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
    (cherry picked from commit 4bd5ac3b7b98001cddf8873458f42a14d0d97ab4)
    
    # Conflicts:
    #       distribution/src/main/release/samples/pom.xml
    (cherry picked from commit d2802dd7832095ecfc24f6b3344283b3f6920b74)
---
 distribution/src/main/release/samples/pom.xml | 2 +-
 parent/pom.xml                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index afbf56cf65..fdbd0bc4c3 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -35,7 +35,7 @@
         <cxf.jetty10.version>10.0.26</cxf.jetty10.version>
         <cxf.netty.version>4.1.128.Final</cxf.netty.version>
         <cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version>
-        <cxf.swagger.ui.version>5.30.0</cxf.swagger.ui.version>
+        <cxf.swagger.ui.version>5.30.1</cxf.swagger.ui.version>
         <cxf.tika.version>2.9.1</cxf.tika.version>
         <cxf.tomcat.version>9.0.110</cxf.tomcat.version>
         <cxf.lucene.version>9.12.3</cxf.lucene.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 3d43bf6c81..c1cddcd3db 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -211,7 +211,7 @@
         <cxf.spring.security.version>5.8.16</cxf.spring.security.version>
         <cxf.spring.version>5.3.39</cxf.spring.version>
         <cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
-        <cxf.swagger.ui.version>5.30.0</cxf.swagger.ui.version>
+        <cxf.swagger.ui.version>5.30.1</cxf.swagger.ui.version>
         <cxf.swagger.v3.version>2.2.40</cxf.swagger.v3.version>
         <cxf.swagger2.version>1.6.15</cxf.swagger2.version>
         <cxf.swagger2.guava.version>32.1.3-jre</cxf.swagger2.guava.version>


(cxf) 01/04: Bump github/codeql-action from 4.31.0 to 4.31.2 (#2699)

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 e8dfd35b41beabd5f21941b1195a9fc607b864ee
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Nov 3 10:53:06 2025 -0500

    Bump github/codeql-action from 4.31.0 to 4.31.2 (#2699)
    
    Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.0 to 4.31.2.
    - [Release notes](https://github.com/github/codeql-action/releases)
    - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
    - [Commits](https://github.com/github/codeql-action/compare/4e94bd11f71e507f7f87df81788dff88d1dacbfb...0499de31b99561a6d14a36a5f662c2a54f91beee)
    
    ---
    updated-dependencies:
    - dependency-name: github/codeql-action
      dependency-version: 4.31.2
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
    (cherry picked from commit a8a5e965562725d89955c345dfe713191fb5d0a2)
    
    # Conflicts:
    #       .github/workflows/scorecards.yml
    (cherry picked from commit ddebbc5a5ec0101ed467e90954d3ed0cdf0724d8)
---
 .github/workflows/codeql-analysis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 34008c6925..1a5daee088 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -61,7 +61,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v3.29.5
+      uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
       with:
         languages: ${{ matrix.language }}
         #config-file: ./.github/codeql/codeql-cxf-config.yml
@@ -89,4 +89,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v3.29.5
+      uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5


(cxf) 03/04: 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 b4080ffe6ca0baecb2ee0deb5ffd761325abec12
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Nov 4 13:16:30 2025 -0500

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index a2a743231b..c4c429b25f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -190,6 +190,7 @@ B 83d19ef010183e53c5bbdecd14316dfe9fd09c3a
 B 83dbdfa61b1fcea20cda11f8d3ecce427933758a
 B 8433b2bbf6eedc177aa537e4a4058505220e019c
 B 853facf1466661d74ccce985926063ed12d3a9d5
+B 868bedf07934feb05e1d9c8319d93f833fe482e5
 B 86a43b9f4074521307baf5f247c9f4d1769b4d89
 B 876a08ba4c22261e3d16fea38bc2e8cf55bef0a8
 B 89a19d577262ac534cf2c0f03ef6776b27903dbc
@@ -1529,6 +1530,7 @@ M d24c9aa71a1e38764c668f44878f64017b3ca6f9
 M d26294e7f6a011101ec76bc707255899b7539755
 M d26b74bd9ca6bd5b9fda7c0de32ff4a2773959d2
 M d26cbbb703ce1458774741f30d50593bc4968709
+M d2802dd7832095ecfc24f6b3344283b3f6920b74
 M d2b076d78c72697fc89f53a10624a9283591ee03
 M d2ec150230d2d4e016706d3ad9a7f6eb5b649323
 M d30c620c9830c26776abdb5e405c7b76a3fb74fc
@@ -1590,6 +1592,7 @@ M dd62525299958e291a9189320563c440a9525347
 M dd74a63a8e59aa2bc762a41370e444cadae4c899
 M dda0c39cd269923f4364f7c2f63b92b40f8165bd
 M ddcc93f12758a13cb4ce98c3d76a68f207ba674f
+M ddebbc5a5ec0101ed467e90954d3ed0cdf0724d8
 M ddf893db202612ab4b4a156c4dd4de32c8c0f695
 M de799c12a747a5696fe3ac0ac83fe19c1f48be96
 M de98ab70f9b40414d799703f344614014cfb8504