Author: manaRH
Date: 2012-05-10 09:35:08 -0400 (Thu, 10 May 2012)
New Revision: 14660
Added:
branches/community/Seam_2_3/distribution/get-arquillian-libs.xml
Removed:
branches/community/Seam_2_3/distribution/arq-aether-task.xml
Modified:
branches/community/Seam_2_3/distribution/pom.xml
branches/community/Seam_2_3/distribution/src/main/assembly/dist.xml
Log:
JBSEAM-4946
Deleted: branches/community/Seam_2_3/distribution/arq-aether-task.xml
===================================================================
--- branches/community/Seam_2_3/distribution/arq-aether-task.xml
2012-05-10 12:26:59 UTC (rev 14659)
+++ branches/community/Seam_2_3/distribution/arq-aether-task.xml
2012-05-10 13:35:08 UTC (rev 14660)
@@ -1,19 +0,0 @@
-<project xmlns:aether="antlib:org.sonatype.aether.ant" default="copyarq">
- <taskdef uri="antlib:org.sonatype.aether.ant"
resource="org/sonatype/aether/ant/antlib.xml">
- <classpath>
- <fileset dir="../build/lib" includes="aether-ant-tasks-*.jar" />
- </classpath>
- </taskdef>
-
- <property name="test.lib.dir" location="test" />
- <property name="version.jboss-as7" value="7.1.1.Final"/>
- <target name="copyarq" >
- <mkdir dir="${test.lib.dir}"/>
- <aether:resolve>
- <aether:dependencies>
- <aether:dependency groupid="org.jboss.as"
artifactid="jboss-as-arquillian-container-managed"
version="${version.jboss-as7}" />
- </aether:dependencies>
- <files dir="${test.lib.dir}"
layout="{artifactId}-{version}-{classifier}.{extension}" />
- </aether:resolve>
- </target>
-</project>
Copied: branches/community/Seam_2_3/distribution/get-arquillian-libs.xml (from
rev 14659, branches/community/Seam_2_3/distribution/arq-aether-task.xml)
===================================================================
--- branches/community/Seam_2_3/distribution/get-arquillian-libs.xml
(rev 0)
+++ branches/community/Seam_2_3/distribution/get-arquillian-libs.xml
2012-05-10 13:35:08 UTC (rev 14660)
@@ -0,0 +1,19 @@
+<project xmlns:aether="antlib:org.sonatype.aether.ant" default="copyarq">
+ <taskdef uri="antlib:org.sonatype.aether.ant"
resource="org/sonatype/aether/ant/antlib.xml">
+ <classpath>
+ <fileset dir="../build/lib" includes="aether-ant-tasks-*.jar" />
+ </classpath>
+ </taskdef>
+
+ <property name="test.lib.dir" location="test" />
+ <property name="version.jboss-as7" value="7.1.1.Final"/>
+ <target name="copyarq" >
+ <mkdir dir="${test.lib.dir}"/>
+ <aether:resolve>
+ <aether:dependencies>
+ <aether:dependency groupid="org.jboss.as"
artifactid="jboss-as-arquillian-container-managed"
version="${version.jboss-as7}" />
+ </aether:dependencies>
+ <files dir="${test.lib.dir}"
layout="{artifactId}-{version}-{classifier}.{extension}" />
+ </aether:resolve>
+ </target>
+</project>
Modified: branches/community/Seam_2_3/distribution/pom.xml
===================================================================
--- branches/community/Seam_2_3/distribution/pom.xml 2012-05-10 12:26:59 UTC
(rev 14659)
+++ branches/community/Seam_2_3/distribution/pom.xml 2012-05-10 13:35:08 UTC
(rev 14660)
@@ -16,16 +16,15 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
<executions>
<execution>
- <phase>validate</phase>
+ <phase>package</phase>
<configuration>
<exportAntProperties>true</exportAntProperties>
<target>
<property name="test.lib.dir"
location="target/arquillian/" />
<property name="version.jboss-as7"
value="${version.jbossas7}" />
- <ant antfile="arq-aether-task.xml"
target="copyarq"/>
+ <ant antfile="get-arquillian-libs.xml"
target="copyarq"/>
</target>
</configuration>
<goals>
Modified: branches/community/Seam_2_3/distribution/src/main/assembly/dist.xml
===================================================================
--- branches/community/Seam_2_3/distribution/src/main/assembly/dist.xml
2012-05-10 12:26:59 UTC (rev 14659)
+++ branches/community/Seam_2_3/distribution/src/main/assembly/dist.xml
2012-05-10 13:35:08 UTC (rev 14660)
@@ -43,7 +43,15 @@
</includes>
<fileMode>0744</fileMode>
</fileSet>
+
<fileSet>
+ <directory>.</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>get-arquillian-libs.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>../extras</directory>
<outputDirectory>extras</outputDirectory>
<includes>
_______________________________________________
seam-commits mailing list
[email protected]
https://lists.jboss.org/mailman/listinfo/seam-commits
