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/11/05 15:14:45 UTC

[cxf] branch 3.4.x-fixes updated (9daecbfa3c -> efafc91440)

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 9daecbfa3c Recording .gitmergeinfo Changes
     new 94506daec9 Update Hibernate to 5.6.14.Final
     new efafc91440 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  | 3 +++
 parent/pom.xml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)


[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 efafc91440255537f7c33542faee92abecc0484c
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Nov 5 11:14:29 2022 -0400

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 0a078acf8e..57d959e8a3 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -30,6 +30,7 @@ B 1b6adcb32f93d708d817cabf2cc63973fbc069de
 B 1cb2a5fe44e390cf2106b07d8b6a8b5fffcda3e7
 B 1cc69bd3ae56bcb514d706d876f9b97135253d34
 B 1f50286782f1b005d857a858af05555017e8e29a
+B 22cb503d5380dd421938c579612360ef58b95b33
 B 237c71cbdc26cbc6e346c8cc592bd17ac892910e
 B 24cdfa9312f878a14ad1ac19b4c9750ae3d8e60e
 B 25ba7358dd56f2827bc2f48098d4e315e6f1baea
@@ -534,6 +535,7 @@ M e0dbc85b5b3383c48fecb97ac11608d7b8c82cc5
 M e13d35af650202c60c5f6bd1eb825f33849da704
 M e31815b50c433a91bac93871bec801c34df2ff57
 M e32cfd0329f1e0405f8b46395dbeac5c1c70dd6d
+M e38cf3c060d03d63f06be2d50ec44f06d42d878e
 M e3bac521f80ebca0fa734d44e49310b1d1d7315f
 M e474ee7d98eb782d1729c1e363ec91706c346069
 M e47b201c3032f64082e9173c0f02d54698388c06
@@ -561,4 +563,5 @@ M f8b2df911055acc776c9b7d64fe3ed529858d507
 M fb7821164ec6d7fb98dc3f8caea67465db230a14
 M fb84ce2f105810a0df0f2deba139a0c7d15e6e4f
 M fcafcae2809e728c46164119af2e9976889a65d2
+M fec6e167afb6270709934ff534db084a35ced4e6
 M ff28b09782aba5a40828f31624bb30f6cce52814


[cxf] 01/02: Update Hibernate to 5.6.14.Final

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 94506daec93921392e7824d39772a8131aecaac6
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Nov 5 09:56:49 2022 -0400

    Update Hibernate to 5.6.14.Final
    
    (cherry picked from commit 5f48aad15a5ba4eb99016dbef1117eca5d84f666)
    
    # Conflicts:
    #       parent/pom.xml
    (cherry picked from commit fec6e167afb6270709934ff534db084a35ced4e6)
    
    # 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 181596b793..f191685990 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -122,7 +122,7 @@
         <cxf.guava.version>30.1-jre</cxf.guava.version>
         <cxf.hamcrest.version>2.2</cxf.hamcrest.version>
         <cxf.hazelcast.version>3.12.13</cxf.hazelcast.version>
-        <cxf.hibernate.em.version>5.6.12.Final</cxf.hibernate.em.version>
+        <cxf.hibernate.em.version>5.6.14.Final</cxf.hibernate.em.version>
         <cxf.hibernate.validator.version>6.2.5.Final</cxf.hibernate.validator.version>
         <cxf.hsqldb.version>2.5.0</cxf.hsqldb.version>
         <cxf.httpcomponents.asyncclient.version.range>[4.0,4.2)</cxf.httpcomponents.asyncclient.version.range>