You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/08/05 19:10:34 UTC
svn commit: r682798 - in /maven/plugins/trunk/maven-antrun-plugin: pom.xml
src/it/settings.xml src/it/test1/pom.xml src/it/test2/pom.xml
src/it/test3/pom.xml src/it/test4/pom.xml src/it/test5/pom.xml
src/it/test6/pom.xml
Author: bentmann
Date: Tue Aug 5 10:10:33 2008
New Revision: 682798
URL: http://svn.apache.org/viewvc?rev=682798&view=rev
Log:
o Updated to maven-invoker-plugin:1.2
o Cleaned up integrations tests
Added:
maven/plugins/trunk/maven-antrun-plugin/src/it/settings.xml (with props)
Modified:
maven/plugins/trunk/maven-antrun-plugin/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/test1/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/test2/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/test3/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/test4/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/test5/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/test6/pom.xml
Modified: maven/plugins/trunk/maven-antrun-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/pom.xml?rev=682798&r1=682797&r2=682798&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/pom.xml Tue Aug 5 10:10:33 2008
@@ -108,29 +108,56 @@
<plugins>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
- <version>1.1</version>
+ <version>1.2</version>
<configuration>
<debug>true</debug>
<projectsDirectory>src/it</projectsDirectory>
+ <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
<pomIncludes>
<pomInclude>**/pom.xml</pomInclude>
</pomIncludes>
<pomExcludes>
<pomExclude>pom.xml</pomExclude>
- <pomExclude>test1/pom.xml</pomExclude>
- <pomExclude>test3/pom.xml</pomExclude>
</pomExcludes>
+ <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+ <settingsFile>src/it/settings.xml</settingsFile>
</configuration>
<executions>
<execution>
<id>integration-test</id>
- <phase>integration-test</phase>
<goals>
+ <goal>install</goal>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
+ <!-- TODO: Remove this plugin execution once MINVOKER-43 is released -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>it-preparation</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <configuration>
+ <file>${project.build.directory}/${project.build.finalName}.jar</file>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <packaging>${project.packaging}</packaging>
+ <pomFile>${basedir}/pom.xml</pomFile>
+ <createChecksum>true</createChecksum>
+ <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+ <!-- NOTE: must match identifier of real local repository or metadata lookup during ITs will misbehave -->
+ <localRepositoryId>local</localRepositoryId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
Added: maven/plugins/trunk/maven-antrun-plugin/src/it/settings.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/settings.xml?rev=682798&view=auto
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/settings.xml (added)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/settings.xml Tue Aug 5 10:10:33 2008
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings>
+ <profiles>
+ <profile>
+ <id>it-repo</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>local.central</id>
+ <url>file://@localRepository@</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>local.central</id>
+ <url>file://@localRepository@</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
+</settings>
Propchange: maven/plugins/trunk/maven-antrun-plugin/src/it/settings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-antrun-plugin/src/it/settings.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/test1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/test1/pom.xml?rev=682798&r1=682797&r2=682798&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/test1/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/test1/pom.xml Tue Aug 5 10:10:33 2008
@@ -14,7 +14,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>3.8.2</version>
</dependency>
</dependencies>
@@ -23,6 +23,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>@pom.version@</version>
<executions>
<execution>
<id>compile</id>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/test2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/test2/pom.xml?rev=682798&r1=682797&r2=682798&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/test2/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/test2/pom.xml Tue Aug 5 10:10:33 2008
@@ -14,7 +14,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>3.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -23,6 +23,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>@pom.version@</version>
<executions>
<execution>
<phase>test</phase>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/test3/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/test3/pom.xml?rev=682798&r1=682797&r2=682798&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/test3/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/test3/pom.xml Tue Aug 5 10:10:33 2008
@@ -14,7 +14,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>3.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -23,6 +23,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>@pom.version@</version>
<executions>
<execution>
<phase>test</phase>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/test4/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/test4/pom.xml?rev=682798&r1=682797&r2=682798&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/test4/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/test4/pom.xml Tue Aug 5 10:10:33 2008
@@ -21,6 +21,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>@pom.version@</version>
<executions>
<execution>
<phase>test</phase>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/test5/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/test5/pom.xml?rev=682798&r1=682797&r2=682798&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/test5/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/test5/pom.xml Tue Aug 5 10:10:33 2008
@@ -22,6 +22,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>@pom.version@</version>
<executions>
<execution>
<phase>test</phase>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/test6/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/test6/pom.xml?rev=682798&r1=682797&r2=682798&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/test6/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/test6/pom.xml Tue Aug 5 10:10:33 2008
@@ -18,6 +18,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>@pom.version@</version>
<executions>
<execution>
<id>compile</id>