Author: alessio.soldano(a)jboss.com Date: 2010-12-20 05:09:10 -0500 (Mon, 20 Dec 2010) New Revision: 405 Modified: core/trunk/core-cxf/pom.xml core/trunk/core-native/pom.xml core/trunk/core/pom.xml core/trunk/integration-testsuite/pom.xml core/trunk/pom.xml Log: [WISE-169] Fixing dependencies Modified: core/trunk/core/pom.xml =================================================================== --- core/trunk/core/pom.xml 2010-12-18 18:17:59 UTC (rev 404) +++ core/trunk/core/pom.xml 2010-12-20 10:09:10 UTC (rev 405) @@ -31,8 +31,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - - + <dependencies> <dependency> <groupId>junit</groupId> @@ -49,50 +48,13 @@ <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> - + <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> </dependency> <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-container</artifactId> - <exclusions> - <exclusion> - <groupId>apache-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </exclusion> - <exclusion> - <groupId>jboss</groupId> - <artifactId>jboss-logging-spi</artifactId> - </exclusion> - </exclusions> - </dependency> - - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-kernel</artifactId> - <exclusions> - <exclusion> - <groupId>wutka-dtdparser</groupId> - <artifactId>dtdparser121</artifactId> - </exclusion> - <exclusion> - <groupId>jboss</groupId> - <artifactId>jboss-logging-spi</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.2</version> - </dependency> - - <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-common</artifactId> </dependency> @@ -140,6 +102,7 @@ <dependency> <groupId>net.jcip</groupId> <artifactId>jcip-annotations</artifactId> + <scope>provided</scope> </dependency> <dependency> Modified: core/trunk/core-cxf/pom.xml =================================================================== --- core/trunk/core-cxf/pom.xml 2010-12-18 18:17:59 UTC (rev 404) +++ core/trunk/core-cxf/pom.xml 2010-12-20 10:09:10 UTC (rev 405) @@ -99,6 +99,12 @@ </dependency> <dependency> + <groupId>net.jcip</groupId> + <artifactId>jcip-annotations</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>sun.jdk</groupId> <artifactId>tools</artifactId> <version>1.5.0</version> Modified: core/trunk/core-native/pom.xml =================================================================== --- core/trunk/core-native/pom.xml 2010-12-18 18:17:59 UTC (rev 404) +++ core/trunk/core-native/pom.xml 2010-12-20 10:09:10 UTC (rev 405) @@ -47,6 +47,13 @@ <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-client</artifactId> </dependency> + + <!-- workaround for http://java.net/jira/browse/JAX_WS-836 --> + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>policy</artifactId> + <version>2.2.1</version> + </dependency> <dependency> <groupId>xalan</groupId> @@ -67,6 +74,12 @@ </dependency> <dependency> + <groupId>net.jcip</groupId> + <artifactId>jcip-annotations</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>sun.jdk</groupId> <artifactId>tools</artifactId> <version>1.5.0</version> Modified: core/trunk/integration-testsuite/pom.xml =================================================================== --- core/trunk/integration-testsuite/pom.xml 2010-12-18 18:17:59 UTC (rev 404) +++ core/trunk/integration-testsuite/pom.xml 2010-12-20 10:09:10 UTC (rev 405) @@ -19,7 +19,11 @@ <name>Wise Integration Test</name> <artifactId>wise-integration-testsuite</artifactId> - <packaging>pom</packaging> + <packaging>pom</packaging> + + <properties> + <jboss-as-server.version>5.1.0.GA</jboss-as-server.version> + </properties> <parent> <groupId>org.jboss.wise</groupId> @@ -55,15 +59,47 @@ <scope>test</scope> </dependency> <dependency> - <groupId>jboss</groupId> - <artifactId>jbossall-client</artifactId> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-server</artifactId> + <version>${jboss-as-server.version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.jpa</groupId> + <artifactId>jboss-jpa-deployers</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.metadata</groupId> + <artifactId>jboss-metadata</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-ejb-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native-saaj</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native-jaxws</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>net.jcip</groupId> + <artifactId>jcip-annotations</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2010-12-18 18:17:59 UTC (rev 404) +++ core/trunk/pom.xml 2010-12-20 10:09:10 UTC (rev 405) @@ -120,12 +120,14 @@ </exclusion> </exclusions> </dependency> + <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> <scope>provided</scope> <version>2.0.4</version> </dependency> + <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> @@ -133,12 +135,12 @@ <version>2.0.4</version> </dependency> - <dependency> <groupId>ant</groupId> <artifactId>ant</artifactId> <version>1.6.5</version> </dependency> + <dependency> <groupId>ant</groupId> <artifactId>ant-nodeps</artifactId> @@ -157,19 +159,13 @@ <version>1.4</version> </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> - </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + <version>2.2.17.GA</version> + </dependency> <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-container</artifactId> - <version>2.0.0.Beta</version> - </dependency> - - <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging-log4j</artifactId> <version>2.2.0.CR1</version> @@ -182,12 +178,6 @@ </dependency> <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-kernel</artifactId> - <version>2.0.0.Beta</version> - </dependency> - - <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-common</artifactId> <version>1.3.0.GA</version> @@ -272,13 +262,7 @@ <version>3.0</version> </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jbossall-client</artifactId> - <version>4.2.2.GA</version> - </dependency> - - <dependency> + <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxws</artifactId> <version>${cxf.version}</version> @@ -288,14 +272,14 @@ <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http</artifactId> <version>${cxf.version}</version> - <scope>test</scope> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http-jetty</artifactId> <version>${cxf.version}</version> - <scope>test</scope> + <scope>test</scope> </dependency> <dependency>