Author: mwringe Date: 2008-06-18 13:07:29 -0400 (Wed, 18 Jun 2008) New Revision: 11082 Modified: modules/test/trunk/build/pom.xml modules/test/trunk/docs/pom.xml modules/test/trunk/docs/user-guide/pom.xml modules/test/trunk/mc/pom.xml modules/test/trunk/pom.xml modules/test/trunk/remote/pom.xml modules/test/trunk/remote/src/test/build.xml modules/test/trunk/test/agent/pom.xml modules/test/trunk/test/core/pom.xml modules/test/trunk/test/generic/pom.xml modules/test/trunk/test/jboss/pom.xml modules/test/trunk/test/opends/pom.xml modules/test/trunk/tooling/ant/pom.xml modules/test/trunk/tooling/core/pom.xml modules/test/trunk/tooling/examples/maven2/pom.xml modules/test/trunk/tooling/maven2/pom.xml modules/test/trunk/tooling/pom.xml modules/test/trunk/unit/pom.xml Log: Update to use cargo 1.0-alpha-3. Fix snapshot version to use '-' instead of '.' Modified: modules/test/trunk/build/pom.xml =================================================================== --- modules/test/trunk/build/pom.xml 2008-06-18 15:02:37 UTC (rev 11081) +++ modules/test/trunk/build/pom.xml 2008-06-18 17:07:29 UTC (rev 11082) @@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.unit</groupId> <artifactId>module-parent</artifactId> - <version>1.2.0.SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>JBoss Portal Test Module</name> <url>http://www.jboss.com/products/jbossmc</url> @@ -27,7 +27,7 @@ <properties> <version.jboss.microcontainer>2.0.0.Beta9</version.jboss.microcontainer> <version.apache.httpclient>3.0.1</version.apache.httpclient> - <version.cargo>0.9-portal</version.cargo> + <version.cargo>1.0-alpha-3</version.cargo> <version.sun.opends>legacy</version.sun.opends> <version.jboss.hibernate>3.2.3.GA</version.jboss.hibernate> <version.dom4j>1.6.1</version.dom4j> @@ -80,7 +80,14 @@ <snapshots> <enabled>true</enabled> </snapshots> - </pluginRepository> + </pluginRepository> + <pluginRepository> + <id>java.net maven repository</id> + <url>http://download.java.net/maven/2/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> </pluginRepositories> <build> @@ -149,8 +156,8 @@ </dependency> <dependency> - <groupId>cargo</groupId> - <artifactId>core</artifactId> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> <version>${version.cargo}</version> </dependency> <dependency> Modified: modules/test/trunk/docs/pom.xml =================================================================== --- modules/test/trunk/docs/pom.xml 2008-06-18 15:02:37 UTC (rev 11081) +++ modules/test/trunk/docs/pom.xml 2008-06-18 17:07:29 UTC (rev 11082) @@ -4,13 +4,13 @@ <parent> <groupId>org.jboss.unit</groupId> <artifactId>module-parent</artifactId> - <version>1.2.0.SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <artifactId>docs-aggregator</artifactId> <packaging>pom</packaging> <name>JBoss Portal Portlet Docs Aggregator</name> - <version>1.2.0.SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <url>http://labs.jboss.com/jbossportal</url> <modules> Modified: modules/test/trunk/docs/user-guide/pom.xml =================================================================== --- modules/test/trunk/docs/user-guide/pom.xml 2008-06-18 15:02:37 UTC (rev 11081) +++ modules/test/trunk/docs/user-guide/pom.xml 2008-06-18 17:07:29 UTC (rev 11082) @@ -60,7 +60,7 @@ <groupId>org.jboss.unit</groupId> <artifactId>user-guide-${translation}</artifactId> - <version>1.2.0.SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>jdocbook</packaging> <name>User_Guide_(${translation})</name> Modified: modules/test/trunk/mc/pom.xml =================================================================== --- modules/test/trunk/mc/pom.xml 2008-06-18 15:02:37 UTC (rev 11081) +++ modules/test/trunk/mc/pom.xml 2008-06-18 17:07:29 UTC (rev 11082) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.unit</groupId> <artifactId>module-parent</artifactId> - <version>1.2.0.SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: modules/test/trunk/pom.xml =================================================================== --- modules/test/trunk/pom.xml 2008-06-18 15:02:37 UTC (rev 11081) +++ modules/test/trunk/pom.xml 2008-06-18 17:07:29 UTC (rev 11082) @@ -5,7 +5,7 @@ <artifactId>module-aggregator</artifactId> <packaging>pom</packaging> <name>JBoss Portal Modules Test</name> - <version>1.2.0.SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <url>http://labs.jboss.com/jbossportal</url> <dependencies/> Modified: modules/test/trunk/remote/pom.xml =================================================================== --- modules/test/trunk/remote/pom.xml 2008-06-18 15:02:37 UTC (rev 11081) +++ modules/test/trunk/remote/pom.xml 2008-06-18 17:07:29 UTC (rev 11082) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.unit</groupId> <artifactId>module-parent</artifactId> - <version>1.2.0.SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -148,15 +148,26 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>cargo</groupId> + <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-ant</artifactId> <version>${version.cargo}</version> + <exclusions> + <exclusion> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>cargo</groupId> + <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> <version>${version.cargo}</version> </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>${version.ant}</version> + </dependency> </dependencies> <executions> <execution> Modified: modules/test/trunk/remote/src/test/build.xml =================================================================== --- modules/test/trunk/remote/src/test/build.xml 2008-06-18 15:02:37 UTC (rev 11081) +++ modules/test/trunk/remote/src/test/build.xml 2008-06-18 17:07:29 UTC (rev 11082) @@ -142,6 +142,7 @@ <sharedClasspath> </sharedClasspath> <configuration> + <property name="cargo.rmi.port" value="1099"/> <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> <property name="cargo.jvmargs" value="${cargo.jvmargs.value}"/> Modified: modules/test/trunk/test/agent/pom.xml =================================================================== --- modules/test/trunk/test/agent/pom.xml 2008-06-18 15:02:37 UTC (rev 11081) +++ modules/test/trunk/test/agent/pom.xml 2008-06-18 17:07:29 UTC (rev 11082) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.unit</groupId> <artifactId>module-parent</artifactId> - <version>1.2.0.SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -13,8 +13,8 @@ <dependencies> <dependency> - <groupId>cargo</groupId> - <artifactId>core</artifactId> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> </dependency> <dependency> <groupId>sun-opends</groupId> @@ -117,4 +117,4 @@ <properties> </properties> -</project> \ No newline at end of file +</project> Modified: modules/test/trunk/test/core/pom.xml =================================================================== --- modules/test/trunk/test/core/pom.xml 2008-06-18 15:02:37 UTC (rev 11081) +++ modules/test/trunk/test/core/pom.xml 2008-06-18 17:07:29 UTC (rev 11082) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.unit</groupId> <artifactId>module-parent</artifactId> - <version>1.2.0.SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -13,8 +13,8 @@ <dependencies> <dependency> - <groupId>cargo</groupId> - <artifactId>core</artifactId> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> </dependency> <dependency> <groupId>sun-opends</groupId> Modified: modules/test/trunk/test/generic/pom.xml =================================================================== --- modules/test/trunk/test/generic/pom.xml 2008-06-18 15:02:37 UTC (rev 11081) +++ modules/test/trunk/test/generic/pom.xml 2008-06-18 17:07:29 UTC (rev 11082) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.unit</groupId> <artifactId>module-parent</artifactId> - <version>1.2.0.SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -13,8 +13,8 @@ <dependencies> <dependency> - <groupId>cargo</groupId> - <artifactId>core</artifactId> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> </dependency> <dependency> <groupId>sun-opends</groupId> Modified: modules/test/trunk/test/jboss/pom.xml =================================================================== --- modules/test/trunk/test/jboss/pom.xml 2008-06-18 15:02:37 UTC (rev 11081) +++ modules/test/trunk/test/jboss/pom.xml 2008-06-18 17:07:29 UTC (rev 11082) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.unit</groupId> <artifactId>module-parent</artifactId> - <version>1.2.0.SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -13,8 +13,8 @@ <dependencies> <dependency> - <groupId>cargo</groupId> - <artifactId>core</artifactId> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> </dependency> <dependency> <groupId>sun-opends</groupId> Modified: modules/test/trunk/test/opends/pom.xml =================================================================== --- modules/test/trunk/test/opends/pom.xml 2008-06-18 15:02:37 UTC (rev 11081) +++ modules/test/trunk/test/opends/pom.xml 2008-06-18 17:07:29 UTC (rev 11082) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.unit</groupId> <artifactId>module-parent</artifactId> - <version>1.2.0.SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -88,4 +88,4 @@ <properties> </properties> -</project> \ No newline at end of file +</project> Modified: modules/test/trunk/tooling/ant/pom.xml =================================================================== --- modules/test/trunk/tooling/ant/pom.xml 2008-06-18 15:02:37 UTC (rev 11081) +++ modules/test/trunk/tooling/ant/pom.xml 2008-06-18 17:07:29 UTC (rev 11082) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.unit</groupId> <artifactId>module-parent</artifactId> - <version>1.2.0.SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: modules/test/trunk/tooling/core/pom.xml =================================================================== --- modules/test/trunk/tooling/core/pom.xml 2008-06-18 15:02:37 UTC (rev 11081) +++ modules/test/trunk/tooling/core/pom.xml 2008-06-18 17:07:29 UTC (rev 11082) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.unit</groupId> <artifactId>module-parent</artifactId> - <version>1.2.0.SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: modules/test/trunk/tooling/examples/maven2/pom.xml =================================================================== --- modules/test/trunk/tooling/examples/maven2/pom.xml 2008-06-18 15:02:37 UTC (rev 11081) +++ modules/test/trunk/tooling/examples/maven2/pom.xml 2008-06-18 17:07:29 UTC (rev 11082) @@ -11,7 +11,7 @@ <dependency> <groupId>org.jboss.unit</groupId> <artifactId>jboss-unit</artifactId> - <version>1.2.0.SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </dependency> </dependencies> @@ -39,7 +39,7 @@ <plugin> <groupId>org.jboss.unit</groupId> <artifactId>jboss-unit-tooling-maven2</artifactId> - <version>1.2.0.SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <executions> <execution> <phase>test</phase> Modified: modules/test/trunk/tooling/maven2/pom.xml =================================================================== --- modules/test/trunk/tooling/maven2/pom.xml 2008-06-18 15:02:37 UTC (rev 11081) +++ modules/test/trunk/tooling/maven2/pom.xml 2008-06-18 17:07:29 UTC (rev 11082) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.unit</groupId> <artifactId>module-parent</artifactId> - <version>1.2.0.SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: modules/test/trunk/tooling/pom.xml =================================================================== --- modules/test/trunk/tooling/pom.xml 2008-06-18 15:02:37 UTC (rev 11081) +++ modules/test/trunk/tooling/pom.xml 2008-06-18 17:07:29 UTC (rev 11082) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.unit</groupId> <artifactId>module-parent</artifactId> - <version>1.2.0.SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -11,10 +11,10 @@ <artifactId>jboss-unit-tooling-aggregator</artifactId> <packaging>pom</packaging> <name>JBoss Unit Tooling (aggregator)</name> - <version>1.2.0.SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <modules> <module>core</module> <module>ant</module> <module>maven2</module> </modules> -</project> \ No newline at end of file +</project> Modified: modules/test/trunk/unit/pom.xml =================================================================== --- modules/test/trunk/unit/pom.xml 2008-06-18 15:02:37 UTC (rev 11081) +++ modules/test/trunk/unit/pom.xml 2008-06-18 17:07:29 UTC (rev 11082) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.unit</groupId> <artifactId>module-parent</artifactId> - <version>1.2.0.SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion>