[jbossws-commits] JBossWS SVN: r16105 - in stack/native/trunk: modules/core and 2 other directories.

Author: ropalka Date: 2012-04-05 10:16:06 -0400 (Thu, 05 Apr 2012) New Revision: 16105 Modified: stack/native/trunk/modules/core/pom.xml stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/pom.xml Log: [JBWS-3462] reviewed Native maven dependencies Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2012-04-05 12:45:05 UTC (rev 16104) +++ stack/native/trunk/modules/core/pom.xml 2012-04-05 14:16:06 UTC (rev 16105) @@ -15,17 +15,19 @@ <!-- Dependencies --> <dependencies> - - <!-- jbossws dependencies --> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-common</artifactId> + <artifactId>jbossws-api</artifactId> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-spi</artifactId> </dependency> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-common</artifactId> + </dependency> + <dependency> <groupId>org.jboss.spec.javax.xml.rpc</groupId> <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId> </dependency> @@ -38,48 +40,35 @@ <artifactId>jbossws-native-factories</artifactId> <version>${project.version}</version> </dependency> - <!-- provided apis --> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.jboss.spec.javax.ejb</groupId> <artifactId>jboss-ejb-api_3.1_spec</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <scope>provided</scope> </dependency> - <!-- jboss provided --> <dependency> <groupId>org.jboss</groupId> <artifactId>jbossxb</artifactId> - <scope>provided</scope> </dependency> <dependency> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </dependency> + <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <scope>provided</scope> </dependency> - <!-- transitive dependencies --> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>javax.xml.stream</groupId> - <artifactId>stax-api</artifactId> - </dependency> - <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> </dependency> @@ -88,17 +77,9 @@ <artifactId>netty</artifactId> </dependency> <dependency> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>wstx-lgpl</artifactId> - </dependency> - <dependency> <groupId>wsdl4j</groupId> <artifactId>wsdl4j</artifactId> </dependency> - <dependency> - <groupId>org.javassist</groupId> - <artifactId>javassist</artifactId> - </dependency> </dependencies> <!-- Build --> Modified: stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-05 12:45:05 UTC (rev 16104) +++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-05 14:16:06 UTC (rev 16105) @@ -38,10 +38,8 @@ <include>org.jboss.ws:jbossws-api:jar</include> <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>wsdl4j:wsdl4j:jar</include> <include>org.jboss.netty:netty:jar</include> - <include>commons-beanutils:commons-beanutils:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <useProjectArtifact>false</useProjectArtifact> @@ -84,16 +82,6 @@ <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> - <outputFileNameMapping>wstx.jar</outputFileNameMapping> - <includes> - <include>org.codehaus.woodstox:wstx-lgpl:jar</include> - </includes> - <useProjectArtifact>false</useProjectArtifact> - </dependencySet> - - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <unpack>false</unpack> <outputFileNameMapping>jaxrpc-api.jar</outputFileNameMapping> <includes> <include>org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec:jar</include> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-04-05 12:45:05 UTC (rev 16104) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-04-05 14:16:06 UTC (rev 16105) @@ -15,16 +15,13 @@ <!-- Properties --> <properties> - <surefire.security.args></surefire.security.args> <surefire.jdwp.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdwp.args> - <surefire.gc.args>-Xmx512m -XX:MaxPermSize=256m</surefire.gc.args> - <surefire.management.args>-Dcom.sun.management.jmxremote</surefire.management.args> + <surefire.gc.args>-Xmx256m -XX:MaxPermSize=128m</surefire.gc.args> <test.archive.directory>${project.build.directory}/test-libs</test.archive.directory> <test.classes.directory>${project.build.directory}/test-classes</test.classes.directory> <test.resources.directory>${project.build.directory}/test-resources</test.resources.directory> <wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location> <jboss.javaee.version>5.0.0.GA</jboss.javaee.version> - <hornetq.version>2.1.0.BETA3</hornetq.version> <log4j.output.dir>${project.build.directory}</log4j.output.dir> <appclient.output.dir>${project.build.directory}/appclient-logs</appclient.output.dir> </properties> @@ -37,10 +34,6 @@ <!-- Dependencies --> <dependencies> <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </dependency> - <dependency> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-core</artifactId> <version>${project.version}</version> @@ -50,16 +43,6 @@ <artifactId>jbossws-shared-testsuite</artifactId> </dependency> <dependency> - <groupId>gnu-getopt</groupId> - <artifactId>getopt</artifactId> - <version>1.0.13</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.16</version> @@ -76,11 +59,6 @@ <version>${jboss.javaee.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.jboss.spec.javax.ejb</groupId> - <artifactId>jboss-ejb-api_3.1_spec</artifactId> - <scope>test</scope> - </dependency> </dependencies> <!-- Build --> @@ -264,7 +242,7 @@ </property> </activation> <properties> - <surefire.jvm.args>${surefire.security.args} ${surefire.jdwp.args} ${surefire.gc.args}</surefire.jvm.args> + <surefire.jvm.args>${surefire.jdwp.args} ${surefire.gc.args}</surefire.jvm.args> </properties> </profile> <profile> @@ -275,38 +253,11 @@ </property> </activation> <properties> - <surefire.jvm.args>${surefire.security.args} ${surefire.gc.args}</surefire.jvm.args> + <surefire.jvm.args>${surefire.gc.args}</surefire.jvm.args> </properties> </profile> <!-- - Name: management - Descr: Enable remote jmx management (useful to attach JConsole, for instance) - --> - <profile> - <id>management</id> - <activation> - <property> - <name>management</name> - </property> - </activation> - <properties> - <surefire.jvm.management.args>${surefire.management.args}</surefire.jvm.management.args> - </properties> - </profile> - <profile> - <id>no-management</id> - <activation> - <property> - <name>!management</name> - </property> - </activation> - <properties> - <surefire.jvm.management.args> </surefire.jvm.management.args> - </properties> - </profile> - - <!-- Name: hudson Descr: Ignore test failures on hudson --> @@ -353,6 +304,10 @@ <groupId>org.jboss</groupId> <artifactId>jboss-remote-naming</artifactId> </exclusion> + <exclusion> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-security</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -361,10 +316,6 @@ <version>1.0.2.Final</version> </dependency> <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </dependency> - <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-ejb-client</artifactId> <version>1.0.4.Final</version> @@ -379,32 +330,13 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - </dependency> <!-- provides org.jboss.ejb3.annotation.SecurityDomain annotation --> <dependency> <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-ext-api</artifactId> <version>2.0.0-beta-1</version> </dependency> - <!-- Apache XML security depends on Xalan impl classes :( --> <dependency> - <groupId>apache-xalan</groupId> - <artifactId>serializer</artifactId> - <version>2.7.1.patch01-brew</version> - </dependency> - <dependency> - <groupId>apache-xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.7.1.patch01-brew</version> - </dependency> - <dependency> <groupId>org.jboss.remotingjmx</groupId> <artifactId>remoting-jmx</artifactId> <version>1.0.2.Final</version> @@ -428,7 +360,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine> + <argLine>${surefire.jvm.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine> <excludes> <!-- # [JBWS-3150] This test causes hudson to freeze --> <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude> @@ -468,6 +400,10 @@ <groupId>org.jboss</groupId> <artifactId>jboss-remote-naming</artifactId> </exclusion> + <exclusion> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-security</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -476,10 +412,6 @@ <version>1.0.2.Final</version> </dependency> <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </dependency> - <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-ejb-client</artifactId> <version>1.0.4.Final</version> @@ -494,32 +426,13 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - </dependency> <!-- provides org.jboss.ejb3.annotation.SecurityDomain annotation --> <dependency> <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-ext-api</artifactId> <version>2.0.0-beta-1</version> </dependency> - <!-- Apache XML security depends on Xalan impl classes :( --> <dependency> - <groupId>apache-xalan</groupId> - <artifactId>serializer</artifactId> - <version>2.7.1.patch01-brew</version> - </dependency> - <dependency> - <groupId>apache-xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.7.1.patch01-brew</version> - </dependency> - <dependency> <groupId>org.jboss.remotingjmx</groupId> <artifactId>remoting-jmx</artifactId> <version>1.0.2.Final</version> @@ -543,7 +456,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine> + <argLine>${surefire.jvm.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine> <excludes> <!-- # [JBWS-3150] This test causes hudson to freeze --> <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2012-04-05 12:45:05 UTC (rev 16104) +++ stack/native/trunk/pom.xml 2012-04-05 14:16:06 UTC (rev 16105) @@ -65,16 +65,13 @@ <jbossws.jboss711.version>4.1.0-SNAPSHOT</jbossws.jboss711.version> <jboss711.version>7.1.1.Final</jboss711.version> <jboss712.version>7.1.2.Final-SNAPSHOT</jboss712.version> + <javassist.version>3.15.0-GA</javassist.version> <ejb.api.version>1.0.1.Final</ejb.api.version> - <commons.logging.version>1.1.1</commons.logging.version> - <javassist.version>3.15.0-GA</javassist.version> <jaxrpc.api.version>1.0.0.Final</jaxrpc.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> <netty.version>3.2.6.Final</netty.version> - <stax.api.version>1.0-2</stax.api.version> - <woodstox.version>3.2.6</woodstox.version> <wsdl4j.version>1.6.2</wsdl4j.version> <xerces.version>2.9.1</xerces.version> <jbossxb.version>2.0.3.GA</jbossxb.version> @@ -94,6 +91,16 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-common</artifactId> <version>${jbossws.common.version}</version> + <exclusions> + <exclusion> + <groupId>jboss.jaxbintros</groupId> + <artifactId>jboss-jaxb-intros</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.spec.javax.xml.ws</groupId> + <artifactId>jboss-jaxws-api_2.2_spec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.ws</groupId> @@ -104,6 +111,12 @@ <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.ws</groupId> @@ -123,6 +136,11 @@ </dependency> <!-- provided apis --> <dependency> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + <version>${javassist.version}</version> + </dependency> + <dependency> <groupId>javax.activation</groupId> <artifactId>activation</artifactId> <version>1.1</version> @@ -152,7 +170,6 @@ <groupId>org.jboss</groupId> <artifactId>jboss-common-core</artifactId> <version>${jboss.common.core.version}</version> - <scope>provided</scope> <exclusions> <exclusion> <groupId>org.jboss.logging</groupId> @@ -160,18 +177,8 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.javassist</groupId> - <artifactId>javassist</artifactId> - <version>${javassist.version}</version> - </dependency> <!-- transitive dependencies --> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>${commons.logging.version}</version> - </dependency> - <dependency> <groupId>org.jboss.spec.javax.ejb</groupId> <artifactId>jboss-ejb-api_3.1_spec</artifactId> <version>${ejb.api.version}</version> @@ -180,6 +187,12 @@ <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> @@ -187,27 +200,11 @@ <version>${saaj.api.version}</version> </dependency> <dependency> - <groupId>javax.xml.stream</groupId> - <artifactId>stax-api</artifactId> - <version>${stax.api.version}</version> - </dependency> - <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging</artifactId> <version>${jboss.logging.version}</version> </dependency> <dependency> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>wstx-lgpl</artifactId> - <version>${woodstox.version}</version> - <exclusions> - <exclusion> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>wsdl4j</groupId> <artifactId>wsdl4j</artifactId> <version>${wsdl4j.version}</version> @@ -228,10 +225,14 @@ <version>${jbossxb.version}</version> <exclusions> <exclusion> - <groupId>jboss</groupId> + <groupId>org.jboss</groupId> <artifactId>jboss-common-core</artifactId> </exclusion> <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-reflect</artifactId> + </exclusion> + <exclusion> <groupId>apache-xerces</groupId> <artifactId>xercesImpl</artifactId> </exclusion> @@ -248,9 +249,21 @@ <artifactId>jboss-logging-log4j</artifactId> </exclusion> <exclusion> - <groupId>apache-xerces</groupId> + <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> </exclusion> + <exclusion> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + </exclusion> + <exclusion> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>com.wutka</groupId> + <artifactId>dtdparser</artifactId> + </exclusion> </exclusions> </dependency> <dependency>