You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2022/10/13 16:14:23 UTC

[cxf] branch 3.4.x-fixes updated (2c9b204cc6 -> 3900e0f501)

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

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


    from 2c9b204cc6 Update Hazelcast to 3.12.13
     new df28acfefc Updating to Commons text 1.10.0
     new 3900e0f501 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  | 1 +
 parent/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)


[cxf] 02/02: Recording .gitmergeinfo Changes

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

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

commit 3900e0f50171f02a12706b3c4465d5e806220b5a
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Oct 13 17:13:08 2022 +0100

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 29c305a979..10867cbf44 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -177,6 +177,7 @@ B d5409bf227b6a00373015d6f92eea00195542b09
 B dbbdc2ce6708bf9949e7bdd658a57e3aef8da6ff
 B dc2b6cc5cc1164f6bb45049bec2373032411f54a
 B dcba66610ce8fecbeeb5fba45edeb2e74d6ecd7f
+B de8c512bb481b648ce8e09388a202e1ab08770cb
 B dedf304666956cd72cdcd7948df2e1736f260ce9
 B df1c14e0f6d2246177c9f01762e19107e79c4393
 B df47e19340ab59dd9eaebac340d89f18e44ef134


[cxf] 01/02: Updating to Commons text 1.10.0

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

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

commit df28acfefc31de54c8afb2de45ce12a619f665c2
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Oct 13 14:54:33 2022 +0100

    Updating to Commons text 1.10.0
    
    (cherry picked from commit beba9e61ec8d380241944621adf7d18af92c1084)
    (cherry picked from commit 28a1ac7d0f8d0b6c6ee56c7a543232e187a09035)
    
    # Conflicts:
    #       parent/pom.xml
    (cherry picked from commit bed1bab8436fe025bb013aa36bc5a4e6bfad23e2)
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index c9a393edf4..05fa8f9ad1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -101,7 +101,7 @@
         <cxf.commons-jcs-jcache.version>2.1</cxf.commons-jcs-jcache.version>
         <cxf.commons-lang3.version>3.12.0</cxf.commons-lang3.version>
         <cxf.commons-logging.version>1.2</cxf.commons-logging.version>
-        <cxf.commons-text.version>1.9</cxf.commons-text.version>
+        <cxf.commons-text.version>1.10.0</cxf.commons-text.version>
         <cxf.derby.version>10.14.2.0</cxf.derby.version>
         <cxf.dom4j.version>2.1.3</cxf.dom4j.version>
         <cxf.dropwizard3.version>3.2.6</cxf.dropwizard3.version>