Author: stephenc
Date: Tue Dec 13 16:55:05 2011
New Revision: 1213780
URL: http://svn.apache.org/viewvc?rev=1213780&view=rev
Log:
[MRELEASE-577] release:prepare does not pass argument --settings with current
settings.xml to inner maven
o With the fix from r1213763 the integration tests will pass without passing
through the -s, so actually this is kind of a test ;-)
Modified:
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/completion-goals/pom.xml
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/forked-basic/pom.xml
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/invoker-basic/pom.xml
Modified:
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/completion-goals/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/prepare/completion-goals/pom.xml?rev=1213780&r1=1213779&r2=1213780&view=diff
==============================================================================
---
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/completion-goals/pom.xml
(original)
+++
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/completion-goals/pom.xml
Tue Dec 13 16:55:05 2011
@@ -39,7 +39,7 @@
<artifactId>maven-release-plugin</artifactId>
<version>@project.version@</version>
<configuration>
- <arguments>-Dflag -Dfoo=bar -s
"@project.build.directory@/it/interpolated-settings.xml"</arguments>
+ <arguments>-Dflag -Dfoo=bar</arguments>
<mavenExecutorId>invoker</mavenExecutorId>
<goals>validate</goals>
<preparationGoals>validate</preparationGoals>
Modified:
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/forked-basic/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/prepare/forked-basic/pom.xml?rev=1213780&r1=1213779&r2=1213780&view=diff
==============================================================================
---
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/forked-basic/pom.xml
(original)
+++
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/forked-basic/pom.xml
Tue Dec 13 16:55:05 2011
@@ -39,7 +39,7 @@
<artifactId>maven-release-plugin</artifactId>
<version>@project.version@</version>
<configuration>
- <arguments>-Dflag -Dfoo=bar -s
"@project.build.directory@/it/interpolated-settings.xml" -D
"[email protected]@/local-repo"</arguments>
+ <arguments>-Dflag -Dfoo=bar -D
"[email protected]@/local-repo"</arguments>
<mavenExecutorId>forked-path</mavenExecutorId>
</configuration>
<dependencies>
Modified:
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/invoker-basic/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/prepare/invoker-basic/pom.xml?rev=1213780&r1=1213779&r2=1213780&view=diff
==============================================================================
---
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/invoker-basic/pom.xml
(original)
+++
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/invoker-basic/pom.xml
Tue Dec 13 16:55:05 2011
@@ -39,7 +39,7 @@
<artifactId>maven-release-plugin</artifactId>
<version>@project.version@</version>
<configuration>
- <arguments>-Dflag -Dfoo=bar -s
"@project.build.directory@/it/interpolated-settings.xml"</arguments>
+ <arguments>-Dflag -Dfoo=bar</arguments>
<mavenExecutorId>invoker</mavenExecutorId>
</configuration>
<dependencies>
