Author: ropalka
Date: 2012-05-11 06:36:20 -0400 (Fri, 11 May 2012)
New Revision: 16261
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/pom.xml
Log:
Merged revisions 16202,16225 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/native/trunk
.......
r16202 | alessio.soldano(a)jboss.com | 2012-04-20 15:42:37 +0200 (Fri, 20 Apr 2012) | 2
lines
[JBWS-3480] Removing duplicated version configuration
.......
r16225 | alessio.soldano(a)jboss.com | 2012-04-27 17:58:41 +0200 (Fri, 27 Apr 2012) | 2
lines
Few pom changes to use jboss version of servlet apis and for cleaning up dependencies a
bit
.......
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,16229-16246
+ /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,16229-16246
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-05-11 10:20:49
UTC (rev 16260)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-05-11 10:36:20
UTC (rev 16261)
@@ -40,8 +40,8 @@
<artifactId>jboss-ejb-api_3.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-05-11 10:20:49 UTC (rev
16260)
+++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-05-11 10:36:20 UTC (rev
16261)
@@ -65,6 +65,7 @@
<javassist.version>3.15.0-GA</javassist.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
<jaxrpc.api.version>1.0.0.Final</jaxrpc.api.version>
+ <servlet.api.version>1.0.1.Final</servlet.api.version>
<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>
@@ -108,12 +109,6 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
<version>${jbossws.spi.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.as</groupId>
@@ -132,24 +127,14 @@
<version>1.1</version>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4.4</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <version>${servlet.api.version}</version>
</dependency>
<!-- jboss provided -->
<dependency>
@@ -173,12 +158,6 @@
<groupId>org.jboss.spec.javax.xml.rpc</groupId>
<artifactId>jboss-jaxrpc-api_1.1_spec</artifactId>
<version>${jaxrpc.api.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.spec.javax.servlet</groupId>
- <artifactId>jboss-servlet-api_3.0_spec</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.xml.soap</groupId>
@@ -299,7 +278,6 @@
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.4</version>
<configuration>
<escapeWindowsPaths>false</escapeWindowsPaths>
</configuration>