Author: richard.opalka(a)jboss.com
Date: 2012-08-28 06:39:19 -0400 (Tue, 28 Aug 2012)
New Revision: 16650
Modified:
stack/native/branches/jbossws-native-4.0.x/
stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml
stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/native/branches/jbossws-native-4.0.x/pom.xml
Log:
Merged revisions 16635 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/native/trunk
.......
r16635 | richard.opalka(a)jboss.com | 2012-08-21 15:23:06 +0200 (Tue, 21 Aug 2012) | 1
line
[JBWS-3537] Upgrade netty 3.2.6 -> 3.4.5
.......
Property changes on: stack/native/branches/jbossws-native-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
-
https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567...
+
https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567...
Modified: svn:mergeinfo
- /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16065,16073-16078,16081-16085,16091-16095,16103-16105,16157-16160,16165,16169-16171,16182,16202-16225,16228-16246,16263,16268,16390
+ /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16065,16073-16078,16081-16085,16091-16095,16103-16105,16157-16160,16165,16169-16171,16182,16202-16225,16228-16246,16263,16268,16390,16635
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-08-28 10:31:19
UTC (rev 16649)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-08-28 10:39:19
UTC (rev 16650)
@@ -68,7 +68,7 @@
<artifactId>mail</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.netty</groupId>
+ <groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</dependency>
<dependency>
Modified:
stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
---
stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-08-28
10:31:19 UTC (rev 16649)
+++
stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-08-28
10:39:19 UTC (rev 16650)
@@ -37,7 +37,7 @@
<include>org.jboss.ws:jbossws-common:jar</include>
<include>org.jboss.ws:jbossws-spi:jar</include>
<include>wsdl4j:wsdl4j:jar</include>
- <include>org.jboss.netty:netty:jar</include>
+ <include>io.netty:netty:jar</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<useProjectArtifact>false</useProjectArtifact>
Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-08-28 10:31:19 UTC (rev
16649)
+++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-08-28 10:39:19 UTC (rev
16650)
@@ -69,7 +69,7 @@
<saaj.api.version>1.0.1.Final</saaj.api.version>
<jboss.common.core.version>2.2.16.GA</jboss.common.core.version>
<jboss.logging.version>3.1.0.GA</jboss.logging.version>
- <netty.version>3.2.6.Final</netty.version>
+ <netty.version>3.4.5.Final</netty.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
<xerces.version>2.9.1</xerces.version>
<jbossxb.version>2.0.3.GA</jbossxb.version>
@@ -180,7 +180,7 @@
<version>${xerces.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.netty</groupId>
+ <groupId>io.netty</groupId>
<artifactId>netty</artifactId>
<version>${netty.version}</version>
</dependency>