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/16 11:31:16 UTC
[1/2] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 1b06c1efa -> 30fa26453
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/c936c75c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c936c75c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c936c75c
Branch: refs/heads/3.0.x-fixes
Commit: c936c75c75f068d000a986a6e856e3ecdd3b26ee
Parents: 1b06c1e
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Jan 16 10:52:55 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Jan 16 10:52:55 2017 +0000
----------------------------------------------------------------------
.gitmergeinfo | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/c936c75c/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 649f7a8..66767ca 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -195,6 +195,7 @@ B 26762a780f4dd498d9304f70072f1bd339223d8a
B 267dc2107ed7e79f167bceaf3d228ea808a20dec
B 2680d111e54c90b9dca63df479f68e82716c0eb2
B 26aba8ecb5c4c461e0feac9b1c60e83b3b6a81f8
+B 27025e07f6803905e0e0ccaa7ad90d828e2ad610
B 27151209eb440ac03876368d443d8df24488cde5
B 2728bb512a58c6337b30d64087f0ee9d00805091
B 27917f3accef78556fa7ed8e79f1746052bfd4d9
@@ -221,6 +222,7 @@ B 2a02f9729130c0ff6a151418dae5f671fee751bf
B 2a2ed67576b525f9708fcb8bd9e8387a277a1f4f
B 2a5d201be1b85344585094d0f044e9bf1b605fac
B 2ac03fe8d2831fdfbb983bba7a7b26901210f8df
+B 2ac0b9a91ee830249c45cacca4e2bb4134921de1
B 2ac7e372ebbb7d27f12c838fc01a2b62faf8e202
B 2adcc64ec3263e494f2ac5520a219b2d3bd9186f
B 2afb9d3cacb299bea854d1ff4824e4c981a41d6a
@@ -1352,6 +1354,7 @@ B f8b1ac80551017ad71aab5dffac4c9098d32254c
B f8b434f9705e5f45bcf8b64e5aa9dd320bd04263
B f8b8025bcf1b4b74712782db73dc2715aeae70fe
B f8df21ed3d17539a81c9cdfdc4222d13ffbe62cd
+B f9144a9fb6002c7ef71be549f3a4078f49441b85
B f9272b565c61ea255a88f12ee2ffa66305233d4f
B f942e1e15d6c4fa83e305eb7452dca8fc80cbdcf
B f94861bd6745e92bc1f69acaa907761f3bcc0613
[2/2] 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/30fa2645
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/30fa2645
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/30fa2645
Branch: refs/heads/3.0.x-fixes
Commit: 30fa26453bfac7503049c710bf419e3a1a426a56
Parents: c936c75
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Jan 16 10:53:09 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Jan 16 10:53:09 2017 +0000
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/30fa2645/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index c3d1b8d..dc94e95 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -134,7 +134,7 @@
<cxf.maven.core.version>2.2.1</cxf.maven.core.version>
<cxf.msv.version>2011.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.1.Final</cxf.netty3.version>
<cxf.netty.version.range>[4,5)</cxf.netty.version.range>
<cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version>