[jboss-cvs] JBossAS SVN: r90537 - in trunk: testsuite and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 23 18:52:11 EDT 2009
Author: pgier
Date: 2009-06-23 18:52:10 -0400 (Tue, 23 Jun 2009)
New Revision: 90537
Modified:
trunk/component-matrix/pom.xml
trunk/testsuite/build.xml
trunk/testsuite/imports/sections/seam.xml
trunk/thirdparty/pom.xml
Log:
[JBBUILD-529] Use local copy of maven ant tasks instead of getting from repository.
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2009-06-23 19:51:14 UTC (rev 90536)
+++ trunk/component-matrix/pom.xml 2009-06-23 22:52:10 UTC (rev 90537)
@@ -115,23 +115,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-ant-tasks</artifactId>
- <version>2.0.9</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>org.jboss.seam.integration</groupId>
<artifactId>jboss-seam-int-microcontainer</artifactId>
<version>${version.seam.integration}</version>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2009-06-23 19:51:14 UTC (rev 90536)
+++ trunk/testsuite/build.xml 2009-06-23 22:52:10 UTC (rev 90537)
@@ -14,7 +14,8 @@
<!-- $Id$ -->
<project default="main" name="JBoss/Testsuite"
- xmlns:server="http://jboss.org/ns/test/ant/server">
+ xmlns:server="http://jboss.org/ns/test/ant/server"
+ xmlns:maven="antlib:org.apache.maven.artifact.ant">
<import file="../tools/etc/buildmagic/build-common.xml"/>
<!-- Tests requiring separate server configurations -->
@@ -363,7 +364,46 @@
<propertyref prefix="jbosstest."/>
</propertyset>
- <target name="init">
+ <target name="init-maven-ant-tasks">
+ <path id="maven-ant-tasks.classpath" path="../tools/maven/ant-tasks/maven-ant-tasks-2.1.0-SNAPSHOT.jar" />
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+ uri="antlib:org.apache.maven.artifact.ant"
+ classpathref="maven-ant-tasks.classpath" />
+
+ </target>
+
+ <target name="init-dependencies" depends="init-maven-ant-tasks">
+ <!-- ================================================================== -->
+ <!-- Init the maven ant tasks -->
+ <!-- ================================================================== -->
+
+ <!--
+ - Initialize properties for each dependency in the thirdparty pom
+ - The properties take the form "groupId:artifactId:packaging"
+ -->
+ <maven:dependencies filesetId="pom.dependencies"
+ versionsId="pom.dependencies.versions"
+ scopes="compile, runtime, test" type="pom, jar, zip, war"
+ addArtifactFileSetRefs="true">
+ <pom file="../thirdparty/pom.xml"/>
+ </maven:dependencies>
+
+ <mapper id="remove-versions" classpathref="maven-ant-tasks.classpath"
+ classname="org.apache.maven.artifact.ant.VersionMapper"
+ from="${pom.dependencies.versions}" to="flatten" />
+
+ <!-- Due to MANTTASKS-148 files with jboss-sar packaging cannot be resolved directly in the pom -->
+ <xmlproperty file="../component-matrix/pom.xml" prefix="component-matrix"/>
+ <maven:dependencies addArtifactFileSetRefs="true">
+ <dependency groupId="jboss.jbossts" artifactId="jbossts-tools"
+ version="${component-matrix.project.properties.version.jboss.jbossts}" type="sar"/>
+ <dependency groupId="org.jboss.jaxr" artifactId="juddi-service"
+ version="${component-matrix.project.properties.version.jboss.jaxr}" type="sar"/>
+ </maven:dependencies>
+
+ </target>
+
+ <target name="init" depends="init-dependencies">
<record name="${basedir}/build.log" append="yes" action="start" loglevel="error"/>
<mkdir dir="${build.gen-src}/org/jboss/test/cts/ejb"/>
<mkdir dir="${build.gen-src}/org/jboss/test/cts/interfaces"/>
Modified: trunk/testsuite/imports/sections/seam.xml
===================================================================
--- trunk/testsuite/imports/sections/seam.xml 2009-06-23 19:51:14 UTC (rev 90536)
+++ trunk/testsuite/imports/sections/seam.xml 2009-06-23 22:52:10 UTC (rev 90537)
@@ -1,14 +1,12 @@
-<project name="tests-seam-jars" xmlns:artifact="urn:maven-artifact-ant">
+<project name="tests-seam-jars" xmlns:maven="antlib:org.apache.maven.artifact.ant">
<property name="seam_version" value="2.1.0.GA"/>
- <target name="_jars-seam">
+ <target name="_jars-seam" depends="init-maven-ant-tasks">
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="apache.maven.ant.tasks.classpath" />
-
<mkdir dir="${build.lib}"/>
- <artifact:dependencies filesetId="examples.fileset" versionsId="examples.versions">
+ <maven:dependencies filesetId="examples.fileset" versionsId="examples.versions">
<dependency groupId="org.jboss.seam.examples" artifactId="jboss-seam-booking" version="${seam_version}" type="ear"/>
<dependency groupId="org.jboss.seam.examples" artifactId="jboss-seam-booking" version="${seam_version}" type="xml" classifier="ds"/>
<dependency groupId="org.jboss.seam.examples" artifactId="jboss-seam-dvd" version="${seam_version}" type="ear"/>
@@ -17,11 +15,11 @@
<dependency groupId="org.jboss.seam.examples" artifactId="jboss-seam-jpa" version="${seam_version}" type="war"/>
<remoterepository id="repository.jboss.org" url="http://repository.jboss.org/maven2"/>
<remoterepository id="snapshots.jboss.org" url="http://snapshots.jboss.org/maven2"/>
- </artifact:dependencies>
+ </maven:dependencies>
<copy todir="${build.lib}">
<fileset refid="examples.fileset" />
- <mapper classpathref="apache.maven.ant.tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${examples.versions}" to="flatten" />
+ <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${examples.versions}" to="flatten" />
</copy>
</target>
Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml 2009-06-23 19:51:14 UTC (rev 90536)
+++ trunk/thirdparty/pom.xml 2009-06-23 22:52:10 UTC (rev 90537)
@@ -960,13 +960,6 @@
</mapping>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-ant-tasks</artifactId>
- <mapping>
- <componentId>apache-maven-ant-tasks</componentId>
- </mapping>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<mapping>
@@ -1006,11 +999,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-ant-tasks</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.seam.integration</groupId>
<artifactId>jboss-seam-int-microcontainer</artifactId>
</dependency>
More information about the jboss-cvs-commits
mailing list