[cxf] branch 3.2.x-fixes updated (dfd1bb3 -> f5705da)

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

[cxf] branch 3.2.x-fixes updated (dfd1bb3 -> f5705da)

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

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


    from dfd1bb3  cleanup/ update dependencies to fix API incompatibility build failure
     new 4b4fd48  Updating Apache Directory
     new a7446dc  Recording .gitmergeinfo Changes
     new f5705da  Revert "Updating woodstox"

The 3 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 | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[cxf] 01/03: Updating Apache Directory

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

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

commit 4b4fd48f5094626e7a6fdc6116886969a0ee6886
Author: Colm O hEigeartaigh <[hidden email]>
AuthorDate: Mon Aug 20 10:26:43 2018 +0100

    Updating Apache Directory
   
    (cherry picked from commit 1449f125586deaf6f5d87e282f0e1502eef4b6b4)
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 9a19d3f..e48ff0e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -71,7 +71,7 @@
         <cxf.activemq.version>5.14.5</cxf.activemq.version>
         <cxf.artemis.version>2.4.0</cxf.artemis.version>
         <cxf.ahc.version>1.9.40</cxf.ahc.version>
-        <cxf.apacheds.version>2.0.0-M24</cxf.apacheds.version>
+        <cxf.apacheds.version>2.0.0.AM25</cxf.apacheds.version>
         <cxf.atmosphere.version>2.4.23</cxf.atmosphere.version>
         <cxf.atmosphere.version.range>[2.4,3.0)</cxf.atmosphere.version.range>
         <cxf.axiom.version>1.2.14</cxf.axiom.version>

Reply | Threaded
Open this post in threaded view
|

[cxf] 02/03: Recording .gitmergeinfo Changes

coheigea
Administrator
In reply to this post by coheigea
This is an automated email from the ASF dual-hosted git repository.

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

commit a7446dcba831adb5ca790fefd72204950f4c2d85
Author: Colm O hEigeartaigh <[hidden email]>
AuthorDate: Mon Aug 20 10:28:14 2018 +0100

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 725189e..1ed6f47 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -9,6 +9,7 @@ B e000e8c0b8ed82533cbeb4e3a39dd9fbf128383c
 B e9261069513b1947e16bf485182c328c07160e1c
 B fc656dc1311963f5fc833856984b36b7ccd26042
 M 0b920d7275800e651b2c48c982b1977249516ddf
+M 1449f125586deaf6f5d87e282f0e1502eef4b6b4
 M 3904a477e70fe6385777120bfe4820ff9a7713f3
 M 4f8ae843f56e3ef84af43ae90f507e196726f0bf
 M 504a1b7827bc76f3c5106b901b44e54513db17aa

Reply | Threaded
Open this post in threaded view
|

[cxf] 03/03: Revert "Updating woodstox"

coheigea
Administrator
In reply to this post by coheigea
This is an automated email from the ASF dual-hosted git repository.

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

commit f5705dab6bdb7887d2368b053152b825ad4dcca4
Author: Colm O hEigeartaigh <[hidden email]>
AuthorDate: Mon Aug 20 10:28:25 2018 +0100

    Revert "Updating woodstox"
   
    This reverts commit b3cf64705ad701efbce445ce6d731ad37b39ee03.
---
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index e48ff0e..a0768b9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -167,8 +167,8 @@
         <cxf.swagger.ui.version>3.17.6</cxf.swagger.ui.version>
         <cxf.tomcat.version>8.0.53</cxf.tomcat.version>
         <cxf.velocity.version>2.0</cxf.velocity.version>
-        <cxf.woodstox.core.version>5.1.0</cxf.woodstox.core.version>
-        <cxf.woodstox.stax2-api.version>4.1</cxf.woodstox.stax2-api.version>
+        <cxf.woodstox.core.version>5.0.3</cxf.woodstox.core.version>
+        <cxf.woodstox.stax2-api.version>3.1.4</cxf.woodstox.stax2-api.version>
         <cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version>
         <cxf.wss4j.version>2.2.2</cxf.wss4j.version>
         <cxf.xbean.version>3.5</cxf.xbean.version>