[jboss-cvs] JBossAS SVN: r72142 - in trunk: component-matrix and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Apr 13 13:35:27 EDT 2008
Author: dimitris at jboss.org
Date: 2008-04-13 13:35:26 -0400 (Sun, 13 Apr 2008)
New Revision: 72142
Modified:
trunk/aspects/pom.xml
trunk/component-matrix/pom.xml
trunk/mbeans/pom.xml
trunk/testsuite/build.xml
trunk/testsuite/imports/server-config.xml
trunk/thirdparty/pom.xml
Log:
JBAS-5425, Switch to the latest org.jboss.test:jboss-test:1.1.0.GA
In this version the ServerManager functionality is broken out to:
org.jboss.jbossas:jboss-server-manager:0.1.0.GA
Modified: trunk/aspects/pom.xml
===================================================================
--- trunk/aspects/pom.xml 2008-04-13 17:13:46 UTC (rev 72141)
+++ trunk/aspects/pom.xml 2008-04-13 17:35:26 UTC (rev 72142)
@@ -120,7 +120,7 @@
<artifactId>jboss-transaction-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
+ <groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
</dependency>
<dependency>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2008-04-13 17:13:46 UTC (rev 72141)
+++ trunk/component-matrix/pom.xml 2008-04-13 17:35:26 UTC (rev 72142)
@@ -843,17 +843,16 @@
<version>2.0.0.Beta14</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
+ <groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
- <version>1.0.5.GA</version>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- </exclusions>
+ <version>1.1.0.GA</version>
</dependency>
<dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-server-manager</artifactId>
+ <version>0.1.0.GA</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-transaction-spi</artifactId>
<version>${version.org.jboss.integration}</version>
@@ -1013,6 +1012,10 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-server</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1041,6 +1044,14 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-server</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
Modified: trunk/mbeans/pom.xml
===================================================================
--- trunk/mbeans/pom.xml 2008-04-13 17:13:46 UTC (rev 72141)
+++ trunk/mbeans/pom.xml 2008-04-13 17:35:26 UTC (rev 72142)
@@ -68,9 +68,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
+ <groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
- <version>1.0.5-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2008-04-13 17:13:46 UTC (rev 72141)
+++ trunk/testsuite/build.xml 2008-04-13 17:35:26 UTC (rev 72142)
@@ -311,7 +311,7 @@
<path refid="jboss.ejb3.classpath"/>
<path refid="jboss.jmx.classpath"/>
<path refid="jboss.jmx-remoting.classpath"/>
- <path refid="jboss.test.classpath"/>
+ <path refid="jboss.test.classpath"/>
<path refid="thirdparty.classpath"/>
</path>
@@ -1723,9 +1723,9 @@
be loaded in a seperate class loader.
-->
<classpath>
- <pathelement location="${build.classes}" />
- <pathelement location="${build.resources}" />
- <pathelement location="${jboss.test.lib}/jboss-test.jar" />
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${build.resources}"/>
+ <path refid="jboss.test.classpath"/>
<path refid="jboss.varia.classpath"/>
</classpath>
Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml 2008-04-13 17:13:46 UTC (rev 72141)
+++ trunk/testsuite/imports/server-config.xml 2008-04-13 17:35:26 UTC (rev 72142)
@@ -60,6 +60,7 @@
uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader">
<classpath id="server.taskdef.classpath">
<path refid="jboss.test.classpath"/>
+ <path refid="jboss.server.manager.classpath"/>
</classpath>
</taskdef>
<taskdef name="start" classname="org.jboss.ant.taskdefs.server.StartServerTask"
Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml 2008-04-13 17:13:46 UTC (rev 72141)
+++ trunk/thirdparty/pom.xml 2008-04-13 17:35:26 UTC (rev 72142)
@@ -602,13 +602,20 @@
</mapping>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
+ <groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
<mapping>
<componentId>jboss.test</componentId>
</mapping>
</dependency>
<dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-server-manager</artifactId>
+ <mapping>
+ <componentId>jboss.server.manager</componentId>
+ </mapping>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi_R4_compendium</artifactId>
<mapping>
@@ -1163,10 +1170,6 @@
<groupId>org.jboss</groupId>
<artifactId>jboss-transaction-spi</artifactId>
</dependency>
- <!--<dependency>
- <groupId>jboss/jaxr</groupId>
- <version>1.2.0.GA</version>
- </dependency>-->
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-core</artifactId>
@@ -1416,10 +1419,14 @@
<artifactId>jboss-serialization</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
+ <groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-server-manager</artifactId>
+ </dependency>
+ <dependency>
<groupId>jboss.web</groupId>
<artifactId>jbossweb</artifactId>
</dependency>
More information about the jboss-cvs-commits
mailing list