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 2024/10/02 23:56:18 UTC

(cxf) branch 3.6.x-fixes updated (e7328567fa -> 58c4189ae5)

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 e7328567fa Recording .gitmergeinfo Changes
     new a716e70d95 Update Netty to 4.1.114.Final
     new 5552147767 Update Swagger Core to 2.2.25
     new c36619151b Update Apache Lucene to 9.12.0
     new 58c4189ae5 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:
 .gitmergeinfo                                 | 4 ++++
 distribution/src/main/release/samples/pom.xml | 4 ++--
 parent/pom.xml                                | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)


(cxf) 02/04: Update Swagger Core to 2.2.25

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 5552147767fc7d89f502bd46c6f6de5338aaa1d8
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Oct 2 12:45:15 2024 -0400

    Update Swagger Core to 2.2.25
    
    (cherry picked from commit 74de4f9b16c91160d4c66a284c2b45de44d945ec)
    (cherry picked from commit c6e64d38b5d8c1114df09009a7f9eed58ef73c35)
    
    # Conflicts:
    #       parent/pom.xml
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 12163a87e2..97e1b1a03a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -211,7 +211,7 @@
         <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.17.14</cxf.swagger.ui.version>
-        <cxf.swagger.v3.version>2.2.24</cxf.swagger.v3.version>
+        <cxf.swagger.v3.version>2.2.25</cxf.swagger.v3.version>
         <cxf.swagger2.version>1.6.14</cxf.swagger2.version>
         <cxf.swagger2.guava.version>32.1.3-jre</cxf.swagger2.guava.version>
         <cxf.swagger2.guava.failureaccess.version>1.0.1</cxf.swagger2.guava.failureaccess.version>


(cxf) 01/04: Update Netty to 4.1.114.Final

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 a716e70d9590c566b28d6d87316bc78b1872a136
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Oct 2 12:39:59 2024 -0400

    Update Netty to 4.1.114.Final
    
    (cherry picked from commit 17d5f097db56b068a73bad99ca210a3c063b0b7a)
    
    # Conflicts:
    #       distribution/src/main/release/samples/pom.xml
    (cherry picked from commit c4a7f6083ec7d3e25a67f0a0093597b39bcfb244)
    
    # Conflicts:
    #       distribution/src/main/release/samples/pom.xml
---
 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 98a3c15562..551efdc211 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -33,7 +33,7 @@
         <cxf.spring.boot.version>2.7.18</cxf.spring.boot.version>
         <cxf.spring.cloud.eureka.version>3.1.7</cxf.spring.cloud.eureka.version>
         <cxf.jetty10.version>10.0.24</cxf.jetty10.version>
-        <cxf.netty.version>4.1.113.Final</cxf.netty.version>
+        <cxf.netty.version>4.1.114.Final</cxf.netty.version>
         <cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version>
         <cxf.swagger.ui.version>5.17.14</cxf.swagger.ui.version>
         <cxf.tika.version>2.9.1</cxf.tika.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 0cb4aac13f..12163a87e2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -177,7 +177,7 @@
         <cxf.msv.version>2022.7</cxf.msv.version>
         <cxf.neethi.version>3.2.0</cxf.neethi.version>
         <cxf.netty.version.range>[4,5)</cxf.netty.version.range>
-        <cxf.netty.version>4.1.113.Final</cxf.netty.version>
+        <cxf.netty.version>4.1.114.Final</cxf.netty.version>
         <cxf.netty.tcnative.version>2.0.46.Final</cxf.netty.tcnative.version>
         <cxf.olingo.version>2.0.12</cxf.olingo.version>
         <cxf.openjpa.version>3.2.2</cxf.openjpa.version>


(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 58c4189ae5c3316e47804184bcd2e5710debab0f
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Oct 2 19:56:03 2024 -0400

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 617a353025..10e1dd40e7 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -127,6 +127,7 @@ B 83d19ef010183e53c5bbdecd14316dfe9fd09c3a
 B 8433b2bbf6eedc177aa537e4a4058505220e019c
 B 853facf1466661d74ccce985926063ed12d3a9d5
 B 86a43b9f4074521307baf5f247c9f4d1769b4d89
+B 876a08ba4c22261e3d16fea38bc2e8cf55bef0a8
 B 89a19d577262ac534cf2c0f03ef6776b27903dbc
 B 8c7c5e7aa4021fb8c1ef117bdfb9a3740b70b5f4
 B 8cc04ad0808d8ef3e062a9345cc0ef7698e8d089
@@ -887,6 +888,7 @@ M 96eb12bb477902baa7a3b9de25915a1cc1ea3cfb
 M 9727de7019a92c184a31e00d2ddffacef7b15d4d
 M 9730f744e655d4c9ec2011876d287875d4a7e285
 M 976e667651a19418319c5b661b22cb4b0e9057b2
+M 977c30fe813806db52b6ac2ea4cca604ff43d689
 M 978ab13382371ecfeccaa2d219ba53ee3b7bdfea
 M 98be30e6813d3c9f6e49c4a21c5ca7e46fada082
 M 9900e83b5970c32d40b797584d5cf6739952a97f
@@ -1077,6 +1079,7 @@ M c1fed11757c28444bd53e7652f19c4a4e2c0352c
 M c27fc631a25999c41a7eca90a5fee51800da7ad0
 M c378cb2326dde28f0c86e130791f31622b054c89
 M c429d51aa11b667a0a55d78e6f894eba246569db
+M c4a7f6083ec7d3e25a67f0a0093597b39bcfb244
 M c4b52ceee197f4eff145496b35f92c6112225075
 M c4f7b78e6a6d6a5ce5e6c595f2efc59c3762e43a
 M c56b1f1c2f491d855bb54f6ef714b75a83bd1202
@@ -1086,6 +1089,7 @@ M c577d730cca11cdc79445cdb2090d418219aa6e7
 M c57b7577645225c6545e22c608c9a1525b252a53
 M c5b7db5a4cceb3df6094ee38215725fd4ecc2b8c
 M c662d7feabf74310c33aad3dd57b28bb650d36ce
+M c6e64d38b5d8c1114df09009a7f9eed58ef73c35
 M c7149a5d86a06f83077894c17f1739aea7094520
 M c7441e5275058a92738d95c876f7090630333f97
 M c76cc94f23620def4dc9433e23284305818b3b52


(cxf) 03/04: Update Apache Lucene to 9.12.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 c36619151bd006354a94bd517c4def0cf8df8a59
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Oct 2 12:51:45 2024 -0400

    Update Apache Lucene to 9.12.0
    
    (cherry picked from commit bb1ea6bac4f980144becebcd79533ca736b44342)
    
    # Conflicts:
    #       distribution/src/main/release/samples/pom.xml
    #       parent/pom.xml
    (cherry picked from commit 977c30fe813806db52b6ac2ea4cca604ff43d689)
    
    # Conflicts:
    #       distribution/src/main/release/samples/pom.xml
    #       parent/pom.xml
---
 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 551efdc211..03c2b07f75 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -38,7 +38,7 @@
         <cxf.swagger.ui.version>5.17.14</cxf.swagger.ui.version>
         <cxf.tika.version>2.9.1</cxf.tika.version>
         <cxf.tomcat.version>9.0.95</cxf.tomcat.version>
-        <cxf.lucene.version>9.11.1</cxf.lucene.version>
+        <cxf.lucene.version>9.12.0</cxf.lucene.version>
         <cxf.aspectj.version>1.9.22.1</cxf.aspectj.version>
         <cxf.brave.version>5.17.0</cxf.brave.version>
         <cxf.camel.version>3.21.1</cxf.camel.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 97e1b1a03a..03eb097e1b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -166,7 +166,7 @@
         <cxf.ldapsdk.version>7.0.1</cxf.ldapsdk.version>
         <cxf.littleproxy.version>1.1.2</cxf.littleproxy.version>
         <cxf.logback.classic.version>1.2.13</cxf.logback.classic.version>
-        <cxf.lucene.version>9.11.1</cxf.lucene.version>
+        <cxf.lucene.version>9.12.0</cxf.lucene.version>
         <cxf.maven.core.version>3.9.8</cxf.maven.core.version>
         <cxf.micrometer.version>1.9.17</cxf.micrometer.version>
         <cxf.microprofile.config.version>2.0</cxf.microprofile.config.version>