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/09/30 17:41:13 UTC
svn commit: r700503 - in /maven/release/trunk/maven-release-plugin: pom.xml
src/it/forked-basic/pom.xml src/it/invoker-basic/pom.xml
src/it/maven-scm-provider-dummy/invoker.properties src/it/settings.xml
Author: bentmann
Date: Tue Sep 30 08:41:13 2008
New Revision: 700503
URL: http://svn.apache.org/viewvc?rev=700503&view=rev
Log:
o Updated to maven-invoker-plugin:1.3
Added:
maven/release/trunk/maven-release-plugin/src/it/maven-scm-provider-dummy/invoker.properties (with props)
Modified:
maven/release/trunk/maven-release-plugin/pom.xml
maven/release/trunk/maven-release-plugin/src/it/forked-basic/pom.xml
maven/release/trunk/maven-release-plugin/src/it/invoker-basic/pom.xml
maven/release/trunk/maven-release-plugin/src/it/settings.xml
Modified: maven/release/trunk/maven-release-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/pom.xml?rev=700503&r1=700502&r2=700503&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/pom.xml (original)
+++ maven/release/trunk/maven-release-plugin/pom.xml Tue Sep 30 08:41:13 2008
@@ -159,11 +159,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
+ <version>1.3</version>
<configuration>
<projectsDirectory>src/it</projectsDirectory>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+ <setupIncludes>
+ <setupInclude>maven-scm-provider-dummy/pom.xml</setupInclude>
+ </setupIncludes>
<pomExcludes>
- <pomExclude>maven-scm-provider-dummy/**</pomExclude>
<pomExclude>project/**</pomExclude>
</pomExcludes>
<postBuildHookScript>verify.bsh</postBuildHookScript>
@@ -179,24 +182,6 @@
</configuration>
<executions>
<execution>
- <id>pre-integration-test</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <pomIncludes>
- <pomInclude>maven-scm-provider-dummy/pom.xml</pomInclude>
- </pomIncludes>
- <pomExcludes>
- <pomExclude>none</pomExclude>
- </pomExcludes>
- <goals>
- <goal>install</goal>
- </goals>
- </configuration>
- </execution>
- <execution>
<id>integration-test</id>
<goals>
<goal>install</goal>
Modified: maven/release/trunk/maven-release-plugin/src/it/forked-basic/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/forked-basic/pom.xml?rev=700503&r1=700502&r2=700503&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/forked-basic/pom.xml (original)
+++ maven/release/trunk/maven-release-plugin/src/it/forked-basic/pom.xml Tue Sep 30 08:41:13 2008
@@ -38,7 +38,7 @@
<plugin>
<artifactId>maven-release-plugin</artifactId>
<configuration>
- <arguments>-Dflag -Dfoo=bar -s "@basedir@/src/it/settings.xml.interpolated" -D "maven.repo.local=@project.build.directory@/local-repo"</arguments>
+ <arguments>-Dflag -Dfoo=bar -s "@project.build.directory@/it/interpolated-settings.xml" -D "maven.repo.local=@project.build.directory@/local-repo"</arguments>
<mavenExecutorId>forked-path</mavenExecutorId>
</configuration>
<dependencies>
Modified: maven/release/trunk/maven-release-plugin/src/it/invoker-basic/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/invoker-basic/pom.xml?rev=700503&r1=700502&r2=700503&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/invoker-basic/pom.xml (original)
+++ maven/release/trunk/maven-release-plugin/src/it/invoker-basic/pom.xml Tue Sep 30 08:41:13 2008
@@ -38,7 +38,7 @@
<plugin>
<artifactId>maven-release-plugin</artifactId>
<configuration>
- <arguments>-Dflag -Dfoo=bar -s "@basedir@/src/it/settings.xml.interpolated"</arguments>
+ <arguments>-Dflag -Dfoo=bar -s "@project.build.directory@/it/interpolated-settings.xml"</arguments>
<mavenExecutorId>invoker</mavenExecutorId>
</configuration>
<dependencies>
Added: maven/release/trunk/maven-release-plugin/src/it/maven-scm-provider-dummy/invoker.properties
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/maven-scm-provider-dummy/invoker.properties?rev=700503&view=auto
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/maven-scm-provider-dummy/invoker.properties (added)
+++ maven/release/trunk/maven-release-plugin/src/it/maven-scm-provider-dummy/invoker.properties Tue Sep 30 08:41:13 2008
@@ -0,0 +1 @@
+invoker.goals = install
Propchange: maven/release/trunk/maven-release-plugin/src/it/maven-scm-provider-dummy/invoker.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/release/trunk/maven-release-plugin/src/it/maven-scm-provider-dummy/invoker.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/release/trunk/maven-release-plugin/src/it/settings.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/settings.xml?rev=700503&r1=700502&r2=700503&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/settings.xml (original)
+++ maven/release/trunk/maven-release-plugin/src/it/settings.xml Tue Sep 30 08:41:13 2008
@@ -27,7 +27,7 @@
<repositories>
<repository>
<id>local.central</id>
- <url>file:///@localRepository@</url>
+ <url>@localRepositoryUrl@</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -50,7 +50,7 @@
<pluginRepositories>
<pluginRepository>
<id>local.central</id>
- <url>file:///@localRepository@</url>
+ <url>@localRepositoryUrl@</url>
<releases>
<enabled>true</enabled>
</releases>