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 2021/02/16 02:59:28 UTC

[cxf] branch 3.3.x-fixes updated (3d8f38b -> 85e8a3a)

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

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


    from 3d8f38b  Recording .gitmergeinfo Changes
     new 56a749a  Update to JUnit 4.13.2
     new 85e8a3a  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 to JUnit 4.13.2

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

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

commit 56a749a8a70a0f25384145db256000831e961152
Author: reta <dr...@gmail.com>
AuthorDate: Mon Feb 15 21:46:54 2021 -0500

    Update to JUnit 4.13.2
    
    (cherry picked from commit eb4bab9983a287bf9dc0574d22077cc783bc88ac)
    
    # 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 d4835c0..e22be40 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -153,7 +153,7 @@
         <cxf.json.api.version>1.1.4</cxf.json.api.version>
         <cxf.json.bind.version>1.0</cxf.json.bind.version>
         <cxf.jsr250.api.version>1.0</cxf.jsr250.api.version>
-        <cxf.junit.version>4.13.1</cxf.junit.version>
+        <cxf.junit.version>4.13.2</cxf.junit.version>
         <cxf.kerby.version>2.0.1</cxf.kerby.version>
         <cxf.littleproxy.version>1.1.2</cxf.littleproxy.version>
         <cxf.log4j.version>1.2.17</cxf.log4j.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.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 85e8a3a9017be137c3e6b3d1933d80f7dabfed43
Author: reta <dr...@gmail.com>
AuthorDate: Mon Feb 15 21:59:09 2021 -0500

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index fe3cd13..6995399 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -544,6 +544,7 @@ M 3b851e904021f5cf9550df82c36ac445fd0efc30
 M 3c855f79bfe7114e496d2d4c67a1815b22eebe6f
 M 3cadca3cf0df538934806297bf2d904d01f90472
 M 3dfe11c866073ff93951dac2b94e0f8e8e464b27
+M 3f3764b5a08dffc6c58c0a69c20851e06ebc2b01
 M 400e003302aab3b83b630a006dbe66324c7ce0d8
 M 4162189dabdb22aec54dc3c5ae93cf42b0575d3d
 M 420f6f35915cbd50cc175a6a10359125516b0213
@@ -681,6 +682,7 @@ M e1b81269089d6e7cb53e949a9fde629d37bce421
 M e2210a3520f39ba2262fa6934b26bd0cd8737e67
 M e38fc4aa14d7741369de5d027b30e52def3a0549
 M e72ad770c9a8f4439b93e2c19e61c43562ac5877
+M eb4bab9983a287bf9dc0574d22077cc783bc88ac
 M edd100917a2f73e43d6e9e34efdc09a854f5c942
 M eded3ad6d5f716f08709f1cc57cfe339d9b61c33
 M ee2cfb039edbe35a6404350de877361ce62c821d