You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2007/04/10 23:00:56 UTC
svn commit: r527296 - in /maven/plugins/trunk/maven-assembly-plugin: pom.xml
src/it/repository-assembly/goals.txt src/it/repository-assembly/pom.xml
src/it/repository-assembly/src/assemble/bin.xml
src/it/repository-assembly/verify.bsh
Author: jdcasey
Date: Tue Apr 10 14:00:55 2007
New Revision: 527296
URL: http://svn.apache.org/viewvc?view=rev&rev=527296
Log:
Fixing repository-assembly IT so it runs correctly...though it now fails (this is related to a new JIRA).
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/repository-assembly/goals.txt (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/repository-assembly/verify.bsh
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/repository-assembly/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/repository-assembly/src/assemble/bin.xml
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?view=diff&rev=527296&r1=527295&r2=527296
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Tue Apr 10 14:00:55 2007
@@ -201,6 +201,7 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
+ <version>2.1</version>
<configuration>
<filesets>
<fileset>
@@ -227,6 +228,7 @@
</plugin>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
+ <version>1.1-SNAPSHOT</version>
<configuration>
<projectsDirectory>src/it</projectsDirectory>
<pomIncludes>
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/repository-assembly/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/repository-assembly/goals.txt?view=auto&rev=527296
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/repository-assembly/goals.txt (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/repository-assembly/goals.txt Tue Apr 10 14:00:55 2007
@@ -0,0 +1 @@
+clean package
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/repository-assembly/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/repository-assembly/goals.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/repository-assembly/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/repository-assembly/pom.xml?view=diff&rev=527296&r1=527295&r2=527296
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/repository-assembly/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/repository-assembly/pom.xml Tue Apr 10 14:00:55 2007
@@ -23,6 +23,16 @@
<descriptor>src/assemble/bin.xml</descriptor>
<finalName>assembly</finalName>
</configuration>
+
+ <executions>
+ <execution>
+ <id>assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/repository-assembly/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/repository-assembly/src/assemble/bin.xml?view=diff&rev=527296&r1=527295&r2=527296
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/repository-assembly/src/assemble/bin.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/repository-assembly/src/assemble/bin.xml Tue Apr 10 14:00:55 2007
@@ -1,7 +1,7 @@
<assembly>
<id>bin</id>
<formats>
- <format>zip</format>
+ <format>dir</format>
</formats>
<repositories>
<repository>
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/repository-assembly/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/repository-assembly/verify.bsh?view=auto&rev=527296
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/repository-assembly/verify.bsh (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/repository-assembly/verify.bsh Tue Apr 10 14:00:55 2007
@@ -0,0 +1,6 @@
+import java.io.*;
+
+File junitJar = new File( basedir, "target/assembly-bin.dir/repo/junit/junit/3.8.1/junit-3.8.1.jar" );
+
+return junitJar.exists();
+