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 2017/01/19 15:45:49 UTC
[1/4] cxf git commit: OpenJpa upgrade to 2.4.2
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 83d23540e -> fc5af6381
OpenJpa upgrade to 2.4.2
# Conflicts:
# parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/dc112ead
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/dc112ead
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/dc112ead
Branch: refs/heads/3.1.x-fixes
Commit: dc112ead5ff94a61fa390c83e3eccd0b9df2f997
Parents: 83d2354
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Jan 16 09:36:19 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Jan 19 14:24:20 2017 +0000
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/dc112ead/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 27ea846..c2bb4ad 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -103,7 +103,7 @@
<cxf.geronimo.jms.version>1.1.1</cxf.geronimo.jms.version>
<cxf.geronimo.j2ee.management.version>1.0.1</cxf.geronimo.j2ee.management.version>
<cxf.geronimo.jpa.version>1.0</cxf.geronimo.jpa.version>
- <cxf.openjpa.version>2.4.1</cxf.openjpa.version>
+ <cxf.openjpa.version>2.4.2</cxf.openjpa.version>
<cxf.geronimo.servlet.version>1.0</cxf.geronimo.servlet.version>
<cxf.geronimo.servlet25.version>1.2</cxf.geronimo.servlet25.version>
<cxf.geronimo.transaction.version>1.1.1</cxf.geronimo.transaction.version>
[3/4] cxf git commit: Some dependency updates
Posted by co...@apache.org.
Some dependency updates
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0bcc7774
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0bcc7774
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0bcc7774
Branch: refs/heads/3.1.x-fixes
Commit: 0bcc77743fad212fb54d119db3719858addcbabc
Parents: 8ca341b
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Jan 19 14:23:19 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Jan 19 14:24:36 2017 +0000
----------------------------------------------------------------------
parent/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/0bcc7774/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8e7c67d..d027482 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -92,7 +92,7 @@
<cxf.httpcomponents.client.version>4.5.2</cxf.httpcomponents.client.version>
<cxf.httpcomponents.core.version>4.4.4</cxf.httpcomponents.core.version>
<cxf.httpcomponents.core.version.range>[4.3,4.5.0)</cxf.httpcomponents.core.version.range>
- <cxf.jackson.version>2.8.4</cxf.jackson.version>
+ <cxf.jackson.version>2.8.6</cxf.jackson.version>
<cxf.james.mim4j.version>0.7.2</cxf.james.mim4j.version>
<cxf.logback.classic.version>1.0.13</cxf.logback.classic.version>
<cxf.log4j.version>1.2.17</cxf.log4j.version>
@@ -142,13 +142,13 @@
<cxf.servlet-api.version>1.0</cxf.servlet-api.version>
<cxf.servlet-api-2.5.artifact>geronimo-servlet_2.5_spec</cxf.servlet-api-2.5.artifact>
<cxf.servlet-api-2.5.version>1.1.2</cxf.servlet-api-2.5.version>
- <cxf.slf4j.version>1.7.21</cxf.slf4j.version>
+ <cxf.slf4j.version>1.7.22</cxf.slf4j.version>
<cxf.specs.jaxws.api.version>1.2</cxf.specs.jaxws.api.version>
<cxf.spring.version>4.1.9.RELEASE</cxf.spring.version>
<cxf.spring.boot.version>1.3.6.RELEASE</cxf.spring.boot.version>
<cxf.spring.security.version>3.2.10.RELEASE</cxf.spring.security.version>
<cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
- <cxf.spring.ldap.version>2.2.0.RELEASE</cxf.spring.ldap.version>
+ <cxf.spring.ldap.version>2.2.1.RELEASE</cxf.spring.ldap.version>
<cxf.spring.mock>spring-test</cxf.spring.mock>
<cxf.swagger.version>1.3.13</cxf.swagger.version>
<cxf.swagger2.version>1.5.12</cxf.swagger2.version>
[2/4] cxf git commit: Updating Netty4
Posted by co...@apache.org.
Updating Netty4
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8ca341b8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8ca341b8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8ca341b8
Branch: refs/heads/3.1.x-fixes
Commit: 8ca341b806145f459a8cdae55d65d34f15579b17
Parents: dc112ea
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Jan 16 09:37:52 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Jan 19 14:24:34 2017 +0000
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/8ca341b8/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index c2bb4ad..8e7c67d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -127,7 +127,7 @@
<cxf.maven.core.version>3.0.5</cxf.maven.core.version>
<cxf.msv.version>2013.6.1</cxf.msv.version>
<cxf.neethi.version>3.0.3</cxf.neethi.version>
- <cxf.netty.version>4.0.19.Final</cxf.netty.version>
+ <cxf.netty.version>4.0.43.Final</cxf.netty.version>
<cxf.netty3.version>3.9.2.Final</cxf.netty3.version>
<cxf.netty.version.range>[4,5)</cxf.netty.version.range>
<cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version>
[4/4] cxf git commit: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fc5af638
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fc5af638
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fc5af638
Branch: refs/heads/3.1.x-fixes
Commit: fc5af6381e71a946b4a9f483dd78542276ea82b0
Parents: 0bcc777
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Jan 19 14:24:36 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Jan 19 14:24:36 2017 +0000
----------------------------------------------------------------------
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/fc5af638/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 80317c1..533f794 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -192,6 +192,7 @@ M 26edcd457ea507075a4c82e2787f11f11a432876
M 2b1607831ccf97909122eae9247116d9a075c7cf
M 2e8219cf3d047abc3a7e2611bf284aadbc20b7d6
M 2f8a1f7645c30cb40d4f080ce4b4099964028751
+M 2f981e098ea265ab504496fbf9ce4564c894bc19
M 366a556210a1a7b047c4b4dd8da4fc74af6bd301
M 386805560479b35276d88605c5acf805e3004aa5
M 39c772a0764b323f98ab58e00345f4fca924c425
@@ -251,6 +252,7 @@ M b49075882641fcebbbdf1ed8d84247fcf80aa558
M b624c034c5682b54b9faf3d3e90eb0c23cde1a5b
M c01c68ddda10ec6db492b86d818498bec0bf4228
M c212240f696e3387df19bbcf22d1851aff320078
+M c55034d9621bc904634017b552057474afb93ac2
M cf8ac102e728b8745da265ec969f7b5160829fdb
M d46818bd3043d211774de9bc531849f54bb2989f
M dba09f00804cc05d943fd95d34882d6368c28edb