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/11/14 09:57:20 UTC
svn commit: r713954 - in /maven/plugins/trunk/maven-ant-plugin: ./ src/it/
src/it/ear-it/ src/it/encoding-it/ src/it/file-repo-it/ src/it/plugin-it/
src/it/relative-path-it/ src/it/single-test-it/
src/it/skip-missing-junit-it/ src/it/skip-test-compilat...
Author: bentmann
Date: Fri Nov 14 00:57:19 2008
New Revision: 713954
URL: http://svn.apache.org/viewvc?rev=713954&view=rev
Log:
o Updated to maven-invoker-plugin:1.3
Added:
maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/invoker.properties (with props)
Removed:
maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/goals-2.txt
maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/goals.txt
maven/plugins/trunk/maven-ant-plugin/src/it/encoding-it/goals.txt
maven/plugins/trunk/maven-ant-plugin/src/it/file-repo-it/goals.txt
maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/goals.txt
maven/plugins/trunk/maven-ant-plugin/src/it/relative-path-it/goals.txt
maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/goals.txt
maven/plugins/trunk/maven-ant-plugin/src/it/skip-missing-junit-it/goals.txt
maven/plugins/trunk/maven-ant-plugin/src/it/skip-test-compilation-it/goals.txt
maven/plugins/trunk/maven-ant-plugin/src/it/skip-test-execution-it/goals.txt
maven/plugins/trunk/maven-ant-plugin/src/it/test-custom-selector-it/goals.txt
maven/plugins/trunk/maven-ant-plugin/src/it/test-default-selector-it/goals.txt
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/goals.txt
Modified:
maven/plugins/trunk/maven-ant-plugin/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/settings.xml
Modified: maven/plugins/trunk/maven-ant-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/pom.xml?rev=713954&r1=713953&r2=713954&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/pom.xml Fri Nov 14 00:57:19 2008
@@ -148,6 +148,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
+ <version>1.3</version>
<configuration>
<debug>true</debug>
<projectsDirectory>src/it</projectsDirectory>
@@ -172,20 +173,6 @@
<goal>run</goal>
</goals>
</execution>
- <!-- TODO: Remove execution once MINVOKER-46 is released -->
- <execution>
- <id>integration-test-phase-2</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <pomIncludes>
- <pomInclude>ear-it/pom.xml</pomInclude>
- </pomIncludes>
- <goalsFile>goals-2.txt</goalsFile>
- </configuration>
- </execution>
</executions>
</plugin>
</plugins>
Added: maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/invoker.properties?rev=713954&view=auto
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/invoker.properties (added)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/invoker.properties Fri Nov 14 00:57:19 2008
@@ -0,0 +1,3 @@
+invoker.goals.1 = clean install ant:ant
+invoker.goals.2 = antrun:run
+invoker.nonRecursive.2 = true
Propchange: maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/invoker.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/invoker.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/settings.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/settings.xml?rev=713954&r1=713953&r2=713954&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/settings.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/settings.xml Fri Nov 14 00:57:19 2008
@@ -29,7 +29,7 @@
<repositories>
<repository>
<id>local.central</id>
- <url>file:///@localRepository@</url>
+ <url>@localRepositoryUrl@</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -52,7 +52,7 @@
<pluginRepositories>
<pluginRepository>
<id>local.central</id>
- <url>file:///@localRepository@</url>
+ <url>@localRepositoryUrl@</url>
<releases>
<enabled>true</enabled>
</releases>