Author: thomas.diesler(a)jboss.com Date: 2008-04-18 11:20:32 -0400 (Fri, 18 Apr 2008) New Revision: 6504 Modified: container/jboss42/branches/jbossws-jboss422/.classpath container/jboss42/branches/jbossws-jboss422/pom.xml Log: Update dependencies Modified: container/jboss42/branches/jbossws-jboss422/.classpath =================================================================== --- container/jboss42/branches/jbossws-jboss422/.classpath 2008-04-18 14:06:56 UTC (rev 6503) +++ container/jboss42/branches/jbossws-jboss422/.classpath 2008-04-18 15:20:32 UTC (rev 6504) @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <classpathentry excluding="**" kind="src" output="src/main/etc" path="src/main/etc"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="output" path=""/> </classpath> Modified: container/jboss42/branches/jbossws-jboss422/pom.xml =================================================================== --- container/jboss42/branches/jbossws-jboss422/pom.xml 2008-04-18 14:06:56 UTC (rev 6503) +++ container/jboss42/branches/jbossws-jboss422/pom.xml 2008-04-18 15:20:32 UTC (rev 6504) @@ -24,17 +24,34 @@ <!-- Properties --> <properties> <jboss.version>4.2.2.GA</jboss.version> + <jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version> + <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version> + + <!-- versions defined in build/build-thirdparty.xml --> + <dom4j.version>1.6.1</dom4j.version> + <jboss.aop.version>1.5.6.GA</jboss.aop.version> + <jboss.common.version>1.2.1.GA</jboss.common.version> + <jboss.microcontainer.version>1.0.2</jboss.microcontainer.version> + <jbossxb.version>1.0.0.SP1</jbossxb.version> </properties> <!-- Dependencies --> <dependencies> + + <!-- jbossws dependencies --> <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - <scope>provided</scope> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-common</artifactId> + <version>${jbossws.common.version}</version> </dependency> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + <version>${jbossws.spi.version}</version> + </dependency> + + <!-- provided apis --> + <dependency> <groupId>javax.ejb</groupId> <artifactId>ejb-api</artifactId> <version>3.0</version> @@ -76,10 +93,17 @@ <version>2.1</version> <scope>provided</scope> </dependency> + + <!-- jboss thirdparty dependencies --> <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>${dom4j.version}</version> + </dependency> + <dependency> <groupId>jboss.aop</groupId> <artifactId>jboss-aop-jdk50</artifactId> - <version>1.5.6.GA</version> + <version>${jboss.aop.version}</version> </dependency> <dependency> <groupId>jboss</groupId> @@ -119,29 +143,24 @@ <dependency> <groupId>jboss.common</groupId> <artifactId>jboss-common</artifactId> - <version>1.2.1.GA</version> + <version>${jboss.common.version}</version> </dependency> <dependency> - <groupId>jboss</groupId> + <groupId>org.jboss</groupId> <artifactId>jbossxb</artifactId> - <version>1.0.0.GA</version> - <scope>provided</scope> + <version>${jbossxb.version}</version> + <exclusions> + <exclusion> + <groupId>jboss.common.core</groupId> + <artifactId>jboss-common-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-microcontainer</artifactId> - <version>1.0.2</version> + <version>${jboss.microcontainer.version}</version> </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-common</artifactId> - <version>3.0.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-spi</artifactId> - <version>3.0.0-SNAPSHOT</version> - </dependency> </dependencies> <!-- Plugins -->