Author: ningjiang
Date: Tue May 28 08:55:03 2013
New Revision: 1486824
URL: http://svn.apache.org/r1486824
Log:
CXF-5041 moved the netty dependencies into parent pom
Modified:
cxf/trunk/parent/pom.xml
cxf/trunk/rt/transports/http-netty/netty-client/pom.xml
cxf/trunk/rt/transports/http-netty/netty-server/pom.xml
Modified: cxf/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1486824&r1=1486823&r2=1486824&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Tue May 28 08:55:03 2013
@@ -132,6 +132,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.2</cxf.neethi.version>
+ <cxf.netty.version>3.6.5.Final</cxf.netty.version>
<cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version>
<cxf.opensaml.version>2.5.3</cxf.opensaml.version>
<cxf.opensaml.osgi.version>2.5.3_1</cxf.opensaml.osgi.version>
@@ -599,6 +600,11 @@
<version>${cxf.mina.version}</version>
</dependency>
<dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>${cxf.netty.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${cxf.httpcomponents.client.version}</version>
Modified: cxf/trunk/rt/transports/http-netty/netty-client/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-netty/netty-client/pom.xml?rev=1486824&r1=1486823&r2=1486824&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-netty/netty-client/pom.xml (original)
+++ cxf/trunk/rt/transports/http-netty/netty-client/pom.xml Tue May 28 08:55:03
2013
@@ -34,10 +34,6 @@
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
- <properties>
- <netty-version>3.6.5.Final</netty-version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -48,7 +44,6 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
- <version>${netty-version}</version>
</dependency>
<dependency>
Modified: cxf/trunk/rt/transports/http-netty/netty-server/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-netty/netty-server/pom.xml?rev=1486824&r1=1486823&r2=1486824&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-netty/netty-server/pom.xml (original)
+++ cxf/trunk/rt/transports/http-netty/netty-server/pom.xml Tue May 28 08:55:03
2013
@@ -34,11 +34,6 @@
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
-
- <properties>
- <netty-version>3.6.5.Final</netty-version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -49,7 +44,6 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
- <version>${netty-version}</version>
</dependency>
<dependency>
