svn commit: r539422 - in /maven/release/trunk/maven-release-manager/src: main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java

[evenisse]

Author: evenisse
Date: Fri May 18 05:27:36 2007
New Revision: 539422

URL: http://svn.apache.org/viewvc?view=rev&rev=539422
Log:
[MRELEASE-233] Check if pom.xml contains modifications
Submitted by: Mark Hobson

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

Modified: 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java
URL: 
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java?view=diff&rev=539422&r1=539421&r2=539422
==============================================================================
--- 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java
 (original)
+++ 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java
 Fri May 18 05:27:36 2007
@@ -64,8 +64,8 @@
      *
      * @todo proper construction of filenames, especially release properties
      */
-    private Set excludedFiles = new HashSet( Arrays.asList( new 
String[]{"pom.xml", "pom.xml.backup", "pom.xml.tag",
-        "pom.xml.next", "release.properties", "pom.xml.releaseBackup"} ) );
+    private Set excludedFiles = new HashSet( Arrays.asList( new String[] { 
"pom.xml.backup", "pom.xml.tag",
+        "pom.xml.next", "release.properties", "pom.xml.releaseBackup" } ) );
 
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, 
Settings settings, List reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException

Modified: 
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java
URL: 
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java?view=diff&rev=539422&r1=539421&r2=539422
==============================================================================
--- 
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java
 (original)
+++ 
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java
 Fri May 18 05:27:36 2007
@@ -235,8 +235,8 @@
     {
         ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
 
-        setChangedFiles( releaseDescriptor, Arrays.asList( new 
String[]{"release.properties", "pom.xml",
-            "pom.xml.backup", "module/pom.xml", "pom.xml.tag", "pom.xml.next"} 
) );
+        setChangedFiles( releaseDescriptor, Arrays.asList( new String[] { 
"release.properties", "pom.xml.backup",
+            "pom.xml.tag", "pom.xml.next" } ) );
 
         phase.execute( releaseDescriptor, null, null );
 
@@ -246,6 +246,36 @@
         assertTrue( true );
     }
 
+    public void testModificationsToPoms()
+        throws Exception
+    {
+        ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
+
+        setChangedFiles( releaseDescriptor, Arrays.asList( new String[] { 
"pom.xml", "module/pom.xml" } ) );
+
+        try
+        {
+            phase.execute( releaseDescriptor, null, null );
+
+            fail( "Status check should have failed" );
+        }
+        catch ( ReleaseFailureException e )
+        {
+            assertTrue( true );
+        }
+
+        try
+        {
+            phase.simulate( releaseDescriptor, null, null );
+
+            fail( "Status check should have failed" );
+        }
+        catch ( ReleaseFailureException e )
+        {
+            assertTrue( true );
+        }
+    }
+
     public void testModificationsToIncludedFilesOnly()
         throws Exception
     {
@@ -281,8 +311,8 @@
     {
         ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
 
-        setChangedFiles( releaseDescriptor, Arrays.asList( new 
String[]{"release.properties", "pom.xml",
-            "pom.xml.backup", "module/pom.xml", "pom.xml.tag", 
"pom.xml.release", "something.txt"} ) );
+        setChangedFiles( releaseDescriptor, Arrays.asList( new String[] { 
"release.properties", "pom.xml.backup",
+            "pom.xml.tag", "pom.xml.release", "something.txt" } ) );
 
         try
         {