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 2022/10/23 14:11:44 UTC

[cxf] branch 3.4.x-fixes updated (d04422fdf7 -> 3013e01dab)

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

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


    from d04422fdf7 Recording .gitmergeinfo Changes
     new 1f53baf539 Update ASM to 9.4
     new 3013e01dab 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  | 2 ++
 parent/pom.xml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)


[cxf] 01/02: Update ASM to 9.4

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

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

commit 1f53baf539267bfb8a38a91b005283871ac60ad4
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Oct 22 14:44:42 2022 -0400

    Update ASM to 9.4
    
    (cherry picked from commit 045d613bb06c21db4b374aeee64926ae7c7bf179)
    
    # Conflicts:
    #       parent/pom.xml
    (cherry picked from commit 23688967655aec0872838813d30e400d4bd16598)
    (cherry picked from commit 45c83916c9a39aae92a9c3ded59c9ac4d273dc66)
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 9cf9343520..112bc71a9f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -54,7 +54,7 @@
         <!-- stuff related to ASM -->
         <cxf.asm.groupId>org.ow2.asm</cxf.asm.groupId>
         <cxf.asm.artifactId>asm</cxf.asm.artifactId>
-        <cxf.asm.version>9.3</cxf.asm.version>
+        <cxf.asm.version>9.4</cxf.asm.version>
         <cxf.osgi.asm.version>[3.0,10)</cxf.osgi.asm.version>
         <cxf.easymock.version>4.3</cxf.easymock.version>
         <!-- OSGi related properties -->


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

commit 3013e01dabcdb2f9ebbd8de5968f19e6cbb7344a
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sun Oct 23 10:11:13 2022 -0400

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index d032012ea9..25b6931e31 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -111,6 +111,7 @@ B 799660ad89472302f8ac9fcdcf818f469601aa42
 B 7cfda87f43d41fddb0e2d0e2501cb3918807e88f
 B 7db51c0f207a3b6a83130272fde6c75f5864b31a
 B 7dcda069b57ee9732a2fb089df35c91c040527f0
+B 7e76b6c39b20cd59cf740e063100d3ce15d2becc
 B 7f49050d5a01af413486ae488594cf89b5bbe9ca
 B 831df7e8403e51eac4140456b027066932ecde11
 B 837401d8b08449ea34304df68600514d1132c499
@@ -336,6 +337,7 @@ M 5cdd7e21e3f0cb31d6ff89380af3cd6330d0ea9d
 M 5df02724d93f6a65ee790136e9c50be350748c26
 M 5e5b6af86a05381c3f972f28f9191a70687601e2
 M 5e7c07a511221e498c3fdd4ccfef8690a547e323
+M 5f3205a8aefbca21b695a74cd71fe3c55b95e0a6
 M 601939d43496c5a1da0e6ff14434f5a50bb3f6a9
 M 606f948737eeff635da799ba02228c5e8debf492
 M 60bea92f15e8286b1fa5b7d5abe174ebc57f7645