Author: rfscholte
Date: Thu May 5 12:22:23 2016
New Revision: 1742421
URL: http://svn.apache.org/viewvc?rev=1742421&view=rev
Log:
rearrange methods, apply @Override
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java?rev=1742421&r1=1742420&r2=1742421&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
Thu May 5 12:22:23 2016
@@ -107,6 +107,7 @@ public abstract class AbstractRewritePom
this.ls = ls;
}
+ @Override
public ReleaseResult execute( ReleaseDescriptor releaseDescriptor,
ReleaseEnvironment releaseEnvironment,
List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
@@ -119,6 +120,49 @@ public abstract class AbstractRewritePom
return result;
}
+
+ @Override
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor,
ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
+ throws ReleaseExecutionException, ReleaseFailureException
+ {
+ ReleaseResult result = new ReleaseResult();
+
+ transform( releaseDescriptor, releaseEnvironment, reactorProjects,
true, result );
+
+ result.setResultCode( ReleaseResult.SUCCESS );
+
+ return result;
+ }
+
+ @Override
+ public ReleaseResult clean( List<MavenProject> reactorProjects )
+ {
+ ReleaseResult result = new ReleaseResult();
+
+ super.clean( reactorProjects );
+
+ if ( reactorProjects != null )
+ {
+ for ( MavenProject project : reactorProjects )
+ {
+ File pomFile = ReleaseUtil.getStandardPom( project );
+ // MRELEASE-273 : if no pom
+ if ( pomFile != null )
+ {
+ File file = new File( pomFile.getParentFile(),
pomFile.getName() + "." + pomSuffix );
+ if ( file.exists() )
+ {
+ file.delete();
+ }
+ }
+ }
+ }
+
+ result.setResultCode( ReleaseResult.SUCCESS );
+
+ return result;
+ }
private void transform( ReleaseDescriptor releaseDescriptor,
ReleaseEnvironment releaseEnvironment,
List<MavenProject> reactorProjects, boolean
simulate, ReleaseResult result )
@@ -694,48 +738,6 @@ public abstract class AbstractRewritePom
IOUtil.close( writer );
}
}
-
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor,
ReleaseEnvironment releaseEnvironment,
- List<MavenProject> reactorProjects )
- throws ReleaseExecutionException, ReleaseFailureException
- {
- ReleaseResult result = new ReleaseResult();
-
- transform( releaseDescriptor, releaseEnvironment, reactorProjects,
true, result );
-
- result.setResultCode( ReleaseResult.SUCCESS );
-
- return result;
- }
-
- public ReleaseResult clean( List<MavenProject> reactorProjects )
- {
- ReleaseResult result = new ReleaseResult();
-
- super.clean( reactorProjects );
-
- if ( reactorProjects != null )
- {
- for ( MavenProject project : reactorProjects )
- {
- File pomFile = ReleaseUtil.getStandardPom( project );
- // MRELEASE-273 : if no pom
- if ( pomFile != null )
- {
- File file = new File( pomFile.getParentFile(),
pomFile.getName() + "." + pomSuffix );
- if ( file.exists() )
- {
- file.delete();
- }
- }
- }
- }
-
- result.setResultCode( ReleaseResult.SUCCESS );
-
- return result;
- }
-
protected abstract String getResolvedSnapshotVersion( String
artifactVersionlessKey,
Map<String,
Map<String, String>> resolvedSnapshots );
