[jbossws-commits] JBossWS SVN: r16138 - in stack/native/branches/jbossws-native-4.0.x: modules/core and 4 other directories.

Author: ropalka Date: 2012-04-10 05:31:07 -0400 (Tue, 10 Apr 2012) New Revision: 16138 Removed: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/codehaus/ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jvnet/ 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/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml stack/native/branches/jbossws-native-4.0.x/pom.xml Log: [JBPAPP-8667] Merged revisions 16083,16085 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r16083 | ropalka | 2012-04-03 13:31:39 +0200 (Tue, 03 Apr 2012) | 1 line [JBWS-3474] removing apache ant & org.jvnet dependencies ....... r16085 | ropalka | 2012-04-04 07:19:59 +0200 (Wed, 04 Apr 2012) | 1 line upgrade config version ....... 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-16082 + /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 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-04-10 09:22:45 UTC (rev 16137) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-04-10 09:31:07 UTC (rev 16138) @@ -44,11 +44,6 @@ </dependency> <!-- provided apis --> <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.annotation</groupId> <artifactId>jsr250-api</artifactId> <scope>provided</scope> 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-04-10 09:22:45 UTC (rev 16137) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-10 09:31:07 UTC (rev 16138) @@ -39,7 +39,6 @@ <include>org.jboss.ws:jbossws-common:jar</include> <include>org.jboss.ws:jbossws-spi:jar</include> <include>javax.xml.stream:stax-api:jar</include> - <include>org.jvnet.staxex:stax-ex:jar</include> <include>wsdl4j:wsdl4j:jar</include> <include>org.jboss.netty:netty:jar</include> <include>commons-beanutils:commons-beanutils:jar</include> Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-04-10 09:22:45 UTC (rev 16137) +++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-04-10 09:31:07 UTC (rev 16138) @@ -60,16 +60,6 @@ <include name="**/jbossxb.jar"/> </fileset> </copy> - <copy todir="@{targetdir}/org/jvnet/staxex/main" flatten="false" overwrite="true"> - <fileset dir="@{thirdpartydir}/lib"> - <include name="**/stax-ex.jar"/> - </fileset> - </copy> - <copy todir="@{targetdir}/org/apache/commons/beanutils/main" flatten="false" overwrite="true"> - <fileset dir="@{thirdpartydir}/lib"> - <include name="**/commons-beanutils.jar"/> - </fileset> - </copy> <copy todir="@{targetdir}/org/jboss/ws/common/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/jbossws-common.jar"/> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml 2012-04-10 09:22:45 UTC (rev 16137) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml 2012-04-10 09:31:07 UTC (rev 16138) @@ -20,7 +20,7 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<server xmlns="urn:jboss:domain:1.2"> +<server xmlns="urn:jboss:domain:1.3"> <extensions> <extension module="org.jboss.as.connector"/> Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-04-10 09:22:45 UTC (rev 16137) +++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-04-10 09:31:07 UTC (rev 16138) @@ -64,7 +64,6 @@ <jbossws.shared.testsuite.version>4.0.3.GA</jbossws.shared.testsuite.version> <jboss712.version>7.1.2.Final-SNAPSHOT</jboss712.version> <ejb.api.version>1.0.1.Final</ejb.api.version> - <ant.version>1.7.1</ant.version> <commons.logging.version>1.1.1</commons.logging.version> <javassist.version>3.15.0-GA</javassist.version> <jaxws.api.version>2.0.0.Final</jaxws.api.version> @@ -113,12 +112,6 @@ </dependency> <!-- provided apis --> <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>${ant.version}</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.activation</groupId> <artifactId>activation</artifactId> <version>1.1</version>