Author: rfscholte
Date: Wed Jun 20 21:00:48 2012
New Revision: 1352317
URL: http://svn.apache.org/viewvc?rev=1352317&view=rev
Log: (empty)
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?rev=1352317&r1=1352316&r2=1352317&view=diff
==============================================================================
---
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
Wed Jun 20 21:00:48 2012
@@ -167,6 +167,7 @@ public class ScmCheckModificationsPhase
{
logDebug( relResult, "Ignoring changed file: " +
fileName );
i.remove();
+ break;
}
}
}
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?rev=1352317&r1=1352316&r2=1352317&view=diff
==============================================================================
---
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
Wed Jun 20 21:00:48 2012
@@ -387,6 +387,20 @@ public class ScmCheckModificationsPhaseT
assertEquals( ReleaseResult.SUCCESS, phase.simulate(
releaseDescriptor, new DefaultReleaseEnvironment(), null ).getResultCode() );
}
+ // MRELEASE-775
+ public void testMultipleExclusionPatternMatch() throws Exception
+ {
+ ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
+
+ releaseDescriptor.setCheckModificationExcludes(
Collections.singletonList( "release.properties" ) );
+
+ setChangedFiles( releaseDescriptor, Arrays.asList( new String[] {
"release.properties" } ) );
+
+ assertEquals( ReleaseResult.SUCCESS, phase.execute( releaseDescriptor,
new DefaultReleaseEnvironment(), null ).getResultCode() );
+
+ assertEquals( ReleaseResult.SUCCESS, phase.simulate(
releaseDescriptor, new DefaultReleaseEnvironment(), null ).getResultCode() );
+ }
+
private void setChangedFiles( ReleaseDescriptor releaseDescriptor,
List<String> changedFiles )
throws Exception
{
