svn commit: r808799 - in /maven/release/trunk/maven-release-plugin: pom.xml src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java

[olamy]

Author: olamy
Date: Fri Aug 28 07:55:16 2009
New Revision: 808799

URL: http://svn.apache.org/viewvc?rev=808799&view=rev
Log:
move the maven version to a property.
Fix junit.
Second tip of day : "really test before committing something" :-)

Modified:
    maven/release/trunk/maven-release-plugin/pom.xml
    
maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java

Modified: maven/release/trunk/maven-release-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/pom.xml?rev=808799&r1=808798&r2=808799&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/pom.xml (original)
+++ maven/release/trunk/maven-release-plugin/pom.xml Fri Aug 28 07:55:16 2009
@@ -40,6 +40,10 @@
     <maven>2.0.6</maven>
   </prerequisites>
 
+  <properties>
+    <mavenVersion>2.0.6</mavenVersion>
+  </properties>
+
   <issueManagement>
     <system>JIRA</system>
     <url>http://jira.codehaus.org/browse/MRELEASE</url>
@@ -55,7 +59,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>2.0.6</version>
+      <version>${mavenVersion}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.release</groupId>
@@ -65,22 +69,22 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
-      <version>2.0.6</version>
+      <version>${mavenVersion}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>2.0.6</version>
+      <version>${mavenVersion}</version>
     </dependency>    
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-project</artifactId>
-      <version>2.0.6</version>
+      <version>${mavenVersion}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-settings</artifactId>
-      <version>2.0.6</version>
+      <version>${mavenVersion}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.scm</groupId>

Modified: 
maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java
URL: 
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java?rev=808799&r1=808798&r2=808799&view=diff
==============================================================================
--- 
maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java
 (original)
+++ 
maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java
 Fri Aug 28 07:55:16 2009
@@ -19,6 +19,7 @@
  * under the License.
  */
 
+import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.testing.AbstractMojoTestCase;
@@ -36,6 +37,7 @@
 import org.jmock.core.stub.ThrowStub;
 
 import java.io.File;
+import java.util.Properties;
 
 /**
  * Test release:prepare.
@@ -51,7 +53,13 @@
         File testFile = getTestFile( 
"target/test-classes/mojos/prepare/prepare.xml" );
         PrepareReleaseMojo mojo = (PrepareReleaseMojo) lookupMojo( "prepare", 
testFile );
         mojo.setBasedir( testFile.getParentFile() );
-
+        mojo.session = new MavenSession( null, null, null, null, null, null, 
null, null, null )
+        {
+          public Properties getExecutionProperties(){
+              return new Properties();
+          };
+        };
+        
         ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
         releaseDescriptor.setWorkingDirectory( 
testFile.getParentFile().getAbsolutePath() );
         Mock mock = new Mock( ReleaseManager.class );
@@ -78,7 +86,12 @@
         File testFile = getTestFile( 
"target/test-classes/mojos/prepare/prepare.xml" );
         PrepareReleaseMojo mojo = (PrepareReleaseMojo) lookupMojo( "prepare", 
testFile );
         mojo.setBasedir( testFile.getParentFile() );
-
+        mojo.session = new MavenSession( null, null, null, null, null, null, 
null, null, null )
+        {
+          public Properties getExecutionProperties(){
+              return new Properties();
+          };
+        };
         ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
         releaseDescriptor.setWorkingDirectory( 
testFile.getParentFile().getAbsolutePath() );
         Mock mock = new Mock( ReleaseManager.class );
@@ -113,7 +126,12 @@
         File testFile = getTestFile( 
"target/test-classes/mojos/prepare/prepare.xml" );
         PrepareReleaseMojo mojo = (PrepareReleaseMojo) lookupMojo( "prepare", 
testFile );
         mojo.setBasedir( testFile.getParentFile() );
-
+        mojo.session = new MavenSession( null, null, null, null, null, null, 
null, null, null )
+        {
+          public Properties getExecutionProperties(){
+              return new Properties();
+          };
+        };
         ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
         releaseDescriptor.setWorkingDirectory( 
testFile.getParentFile().getAbsolutePath() );
         Mock mock = new Mock( ReleaseManager.class );