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 2020/05/11 13:57:47 UTC

[cxf] branch 3.3.x-fixes updated (ab0b2be -> e7bc226)

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

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


    from ab0b2be  Recording .gitmergeinfo Changes
     new 23cb938  Updating dom4j to 2.1.3
     new e7bc226  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] 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.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit e7bc226811e1bfaeed7c57bd325bd4f2683ac866
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon May 11 14:57:28 2020 +0100

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index a22ff65..91a01d1 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -196,6 +196,7 @@ B d0ab91453608304dd9284aea3e7a9a829d755fdc
 B d334b46e36d58d3b08b678baefa22f0f09ca34c2
 B d34a270473c308bd8f51d4a518ea7933a1db4e46
 B d4d4b1e740a48103811e33094adb19d5c22ca108
+B d5b7fbe585c959007adb5916ddd85350b9dd6f03
 B d9fd7f1a0439d93db7d89f1ae1bc87e7b12c05ec
 B da4dfeed6867ed628dc05c9a2dbedbebdf33db21
 B daf7c2a073f8ae11613bc8e2f02a2225f6162d5f
@@ -261,6 +262,7 @@ M 528b35178ec31860cf5ad2095d6f3cc3c951d914
 M 55abc6f8416fd81f26627fa42a37f903f9ef7965
 M 56e962c295f48e9f48dbd0884df79e5e48601284
 M 589e321622b72ae57fab910d76b3e4fb0c160979
+M 5962c8b4fcbb072796b3093144583950e6b52eb7
 M 59ba4821c92146723df063f9eb6e1c3ae0be5834
 M 5aa0660a9fe324e5c8f36e47e270971d0e85b6f8
 M 5e511db3de3e44f19ad1828c36edbf56f8d01eff


[cxf] 01/02: Updating dom4j to 2.1.3

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

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

commit 23cb938cb31df32a89cce934013d20a6ff941bfd
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon May 11 14:55:59 2020 +0100

    Updating dom4j to 2.1.3
    
    (cherry picked from commit 5962c8b4fcbb072796b3093144583950e6b52eb7)
    
    # 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 b8183f1..9b7bdcb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -102,7 +102,7 @@
         <cxf.commons-logging.version>1.2</cxf.commons-logging.version>
         <cxf.commons-text.version>1.8</cxf.commons-text.version>
         <cxf.derby.version>10.14.2.0</cxf.derby.version>
-        <cxf.dom4j.version>2.1.1</cxf.dom4j.version>
+        <cxf.dom4j.version>2.1.3</cxf.dom4j.version>
         <cxf.dropwizard.version>3.2.6</cxf.dropwizard.version>
         <cxf.ehcache.version>2.10.6</cxf.ehcache.version>
         <cxf.ehcache3.version>3.8.1</cxf.ehcache3.version>