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 2019/09/06 11:35:18 UTC

[cxf] branch 3.3.x-fixes updated (cde58ad -> 0a84acd)

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 cde58ad  Upgrade to latest bundle plugin created some unnecessary hard OSGi deps
     new 116e4ce  Updating httpcomponents core + maven
     new 0a84acd  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 | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)


[cxf] 01/02: Updating httpcomponents core + maven

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 116e4ce03c5b23b901832aa665efa6bf8a353063
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Sep 6 12:34:17 2019 +0100

    Updating httpcomponents core + maven
    
    (cherry picked from commit 9c462e9bd614d529f0a2fd86490243ea1c858651)
    
    # Conflicts:
    #	parent/pom.xml
---
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 35d4a15..7bcc4e8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -127,7 +127,7 @@
         <cxf.httpcomponents.asyncclient.version>4.1.4</cxf.httpcomponents.asyncclient.version>
         <cxf.httpcomponents.client.version>4.5.9</cxf.httpcomponents.client.version>
         <cxf.httpcomponents.core.version.range>[4.3,4.5.0)</cxf.httpcomponents.core.version.range>
-        <cxf.httpcomponents.core.version>4.4.11</cxf.httpcomponents.core.version>
+        <cxf.httpcomponents.core.version>4.4.12</cxf.httpcomponents.core.version>
         <cxf.jackson.version>2.9.9</cxf.jackson.version>
         <cxf.jackson.databind.version>2.9.9.3</cxf.jackson.databind.version>
         <cxf.jaeger.version>0.35.5</cxf.jaeger.version>
@@ -158,7 +158,7 @@
         <cxf.log4j.version>1.2.17</cxf.log4j.version>
         <cxf.logback.classic.version>1.2.3</cxf.logback.classic.version>
         <cxf.lucene.version>4.9.1</cxf.lucene.version>
-        <cxf.maven.core.version>3.6.1</cxf.maven.core.version>
+        <cxf.maven.core.version>3.6.2</cxf.maven.core.version>
         <cxf.microprofile.config.version>1.1</cxf.microprofile.config.version>
         <cxf.microprofile.rest.client.version>1.3.3</cxf.microprofile.rest.client.version>
         <cxf.mina.version>2.0.21</cxf.mina.version>


[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 0a84acdef8cffef448e78ffaf6c369519a348c4a
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Sep 6 12:35:08 2019 +0100

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 13470a9..d53047b 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -9,4 +9,5 @@ B 9196f3364085c9f9ba6319d7b068d44206b0e290
 B e6d432be93022b5b4ac1998a546d0652861fdff3
 M 09ddfdeaef6f32537dba23fa6d7ef36992b3217b
 M 5aa0660a9fe324e5c8f36e47e270971d0e85b6f8
+M 9c462e9bd614d529f0a2fd86490243ea1c858651
 M e1b81269089d6e7cb53e949a9fde629d37bce421