Author: jdcasey
Date: Fri Feb 1 13:17:09 2008
New Revision: 617650
URL: http://svn.apache.org/viewvc?rev=617650&view=rev
Log:
Fixing two of the failing ITs.
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/pom.xml
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=617650&r1=617649&r2=617650&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Fri Feb 1 13:17:09 2008
@@ -268,7 +268,7 @@
</plugin>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1</version>
<executions>
<execution>
<id>setup-integration-test-parent</id>
@@ -294,6 +294,7 @@
</goals>
<configuration>
<projectsDirectory>${project.build.testOutputDirectory}/projects</projectsDirectory>
+ <testPropertiesFile>test.properties</testPropertiesFile>
<debug>true</debug>
<!-- Useful config for debugging one IT -->
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/pom.xml?rev=617650&r1=617649&r2=617650&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/pom.xml Fri Feb 1 13:17:09 2008
@@ -18,4 +18,17 @@
<module>child1</module>
<module>child2</module>
</modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assemble/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/pom.xml?rev=617650&r1=617649&r2=617650&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/pom.xml Fri Feb 1 13:17:09 2008
@@ -18,4 +18,17 @@
<module>child1</module>
<module>child2</module>
</modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assemble/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>