maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r547685 - in /maven/release/trunk/maven-release-manager/src: main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java test/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhaseTest.java
Date Fri, 15 Jun 2007 13:52:53 GMT
Author: markh
Date: Fri Jun 15 06:52:52 2007
New Revision: 547685

URL: http://svn.apache.org/viewvc?view=rev&rev=547685
Log:
[MRELEASE-243] Release pom is deployed and embedded in artifacts

o Force use of pom.xml over release-pom.xml

Modified:
    maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java
    maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhaseTest.java

Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java?view=diff&rev=547685&r1=547684&r2=547685
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java
(original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java
Fri Jun 15 06:52:52 2007
@@ -53,6 +53,16 @@
                 additionalArguments = "-DperformRelease=true";
             }
         }
+        
+        // ensure we don't use the release pom for the perform goals
+        if ( !StringUtils.isEmpty( additionalArguments ) )
+        {
+            additionalArguments = additionalArguments + " -f pom.xml";
+        }
+        else
+        {
+            additionalArguments = "-f pom.xml";
+        }
 
         return execute( releaseDescriptor, new File( releaseDescriptor.getCheckoutDirectory()
), additionalArguments );
     }

Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhaseTest.java?view=diff&rev=547685&r1=547684&r2=547685
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhaseTest.java
(original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhaseTest.java
Fri Jun 15 06:52:52 2007
@@ -44,7 +44,7 @@
 
         Mock mock = new Mock( MavenExecutor.class );
         Constraint[] constraints = new Constraint[]{new IsEqual( testFile ), new IsEqual(
"goal1 goal2" ),
-            new IsEqual( Boolean.TRUE ), new IsEqual( "-DperformRelease=true" ), new IsAnything()};
+            new IsEqual( Boolean.TRUE ), new IsEqual( "-DperformRelease=true -f pom.xml"
), new IsAnything()};
         mock.expects( new InvokeOnceMatcher() ).method( "executeGoals" ).with( constraints
).will(
             new ThrowStub( new MavenExecutorException( "...", new Exception() ) ) );
 



Mime
View raw message