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/09/20 16:16:53 UTC

[cxf] branch 3.5.x-fixes updated (73514aba9a -> f2bc2f5f4d)

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

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


    from 73514aba9a CXF-8928: Reduce code quality warnings in generated code (#1435)
     new 80e43886b9 Update Apache Karaf to 4.3.10
     new f2bc2f5f4d 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                                                       | 6 ++++++
 .../karaf/features/src/main/resources/org.apache.karaf.features.xml | 2 +-
 parent/pom.xml                                                      | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)


[cxf] 01/02: Update Apache Karaf to 4.3.10

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

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

commit 80e43886b90b48a852950c58891a282b05672746
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Sep 20 12:16:00 2023 -0400

    Update Apache Karaf to 4.3.10
---
 osgi/karaf/features/src/main/resources/org.apache.karaf.features.xml | 2 +-
 parent/pom.xml                                                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osgi/karaf/features/src/main/resources/org.apache.karaf.features.xml b/osgi/karaf/features/src/main/resources/org.apache.karaf.features.xml
index 99e714303d..27f429e656 100644
--- a/osgi/karaf/features/src/main/resources/org.apache.karaf.features.xml
+++ b/osgi/karaf/features/src/main/resources/org.apache.karaf.features.xml
@@ -20,7 +20,7 @@
 <featuresProcessing xmlns="http://karaf.apache.org/xmlns/features-processing/v1.0.0" xmlns:f="http://karaf.apache.org/xmlns/features/v1.6.0">
    <featureReplacements>
         <replacement mode="merge">
-            <feature name="pax-http-undertow" version="7.3.27">
+            <feature name="pax-http-undertow" version="7.3.29">
                 <f:bundle start-level="35">mvn:org.apache.cxf/cxf-servlet-compatible/${project.version}</f:bundle>
             </feature>
         </replacement>
diff --git a/parent/pom.xml b/parent/pom.xml
index bea76dd0b7..392d53440d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -257,7 +257,7 @@
         <cxf.jaxb.bundle.version>2.3.2_1</cxf.jaxb.bundle.version>
         <cxf.jaxb.context.class.property>none</cxf.jaxb.context.class.property>
         <cxf.jdom.bundle.version>1.1_4</cxf.jdom.bundle.version>
-        <cxf.karaf.version>4.3.8</cxf.karaf.version>
+        <cxf.karaf.version>4.3.10</cxf.karaf.version>
         <cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version>
         <cxf.oro.bundle.version>2.0.8_6</cxf.oro.bundle.version>
         <cxf.osgi.saaj.version>[1.4,2)</cxf.osgi.saaj.version>


[cxf] 02/02: 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.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit f2bc2f5f4dea260d67cb30169c989f130f4d3eb1
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Sep 20 12:16:40 2023 -0400

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index f5f8200965..56682e013a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -2,6 +2,7 @@ origin/3.6.x-fixes
 
 B 009475b7c33165de61ea8b4c6183d2f75db00cd9
 B 00bbab65e59b8f27366335aec19e50129b7759f0
+B 0212552e55f5989dba7dea530c31eb0da7865a89
 B 0233bbf8fb5599639978d8c60b6df12e668d7d6b
 B 026e79a86c47387ad3461210e53cd0dc0034ccbe
 B 04086372b7b0be8475699ffa1dac908e7fff6bff
@@ -408,6 +409,7 @@ M 2c67a400a5dec9dc6bd8d7b72160f2cb58021f1f
 M 2ccc490f8a993130c8f37cf6455ea2e6edd7a333
 M 2d0342d51e6a13b7af5980863ba1b7436724daf8
 M 2d68a2e46debfcc27fc845ea08fbe078a8abff1a
+M 2f29b6725823ec058095778f819d5fd5b1eda4af
 M 2f59ffac0752b453ba8b0673f321d5c29e1d7781
 M 2fda4dd66aba6ac290b9f3773e423c2bc5c61dcb
 M 2ff109358027653d1afd6f252cf6f25048cafbb9
@@ -425,6 +427,7 @@ M 38a09d0b606f5dc0aa3a477791af76fd6f1c0cb6
 M 38b06816ac276542d7f3de3a8f867e6aa739659c
 M 395cba5b5a6b6725e6a54d41ee9b3b1675ffbb43
 M 396f0406fd857ac0c947cf5f57d483e362380b79
+M 3af07983a1d4e569761a8e39e76cea74ae384d9b
 M 3b1c2cc3e8b139cb805f8073b2cf49fc1a6faca9
 M 3ba3ce8f7bd1a86d2063761bd7a8df323f98c448
 M 3c95abf3be5c52a4b800f8139f8633088f0c9be7
@@ -461,6 +464,7 @@ M 54b55ac35a101af792f3aa8e1598a200ef704c9e
 M 5566cc4600827e08fda454c5644b9ec81251fbba
 M 56a61325089695721be79eff8afec02095d98783
 M 574b44aefb77baab37feab88adf1445f3b538a95
+M 57d2ec17425c8fa6b0139c32183953b179b6a507
 M 584b08ae11803f5c24725cdc0ad7c0b0b507927d
 M 58dc25cb2c441511a7ca65476e7a84d5d3df167b
 M 5b69dd06a61a8985e9166108e66e56f481a438cf
@@ -579,6 +583,7 @@ M a99701a0395b820df183884d814c70ca3092fa92
 M aa09f875b0f71f1374535396f05910da7e90a3d6
 M aa74b1f2c53b89b4bd7107cd7ec06588bae55b81
 M ab04ccabc1a99bc0ecda91b6408dae30b4f3093f
+M ab710cf586810aab49db03be7495dc49ac0cc1c8
 M ac0687fe6b83cb34bcf78cb215df4543cc55c6ed
 M ac4e5c1a5e4b57f58ed3129455f3fdc2a86d60cc
 M ac5210e61d5a8d40c2ee9a3512f3e2ce3adc7e4a
@@ -648,6 +653,7 @@ M d849512da6499d00e3e84eb60733a0343a473b44
 M d86920ce70dfe74836f18180dc5d47c8437f0250
 M d891059f0de95a27e69179a0bfa0e80eb251bb3f
 M da73da6c8011d7d76c275a1636bbe64849072563
+M db3d8e3d673adef8dd6cf1cba49fa8df7e049c55
 M db6fcc8871fd8469907f3bfadfa6f1824e52a966
 M dc7541fe5a7bbed90c48c35bba959fcb0dd345a1
 M dec561cf2c2a6628071a6ca74a2ff917afff9868