Fixed improper merge with upstream

apache · Jul 16, 2018 · 1962097 · 1962097
1 parent 5797a6a
commit 1962097
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/...n-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java b/...n-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java
@@ -415,5 +415,17 @@ public interface ReleaseDescriptor
 
     void setScmSourceUrl( String scmUrl );
 
+    /**
+     * Get whether unresolved snapshot dependencies should automatically be resolved.
+     * 
+     * @return boolean
+     */
+    boolean isAutoResolveSnapshotDependencies();
 
+    /**
+     * Returns the default answer to be used when unresolved snapshot dependencies should automatically be resolved.
+     * 
+     * @return int
+     */
+    int getAutoResolveSnapshotDependenciesMode();
 }
diff --git a/...-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java b/...-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
@@ -229,12 +229,6 @@ public void rollback( ReleaseRollbackRequest rollbackRequest )
 
         goalStart( rollbackRequest.getReleaseManagerListener(), "rollback", rollbackPhases );
 
-        Strategy releaseStrategy = getStrategy( releaseDescriptor.getReleaseStrategyId() );
-
-        List<String> rollbackPhases = getGoalPhases( releaseStrategy, "rollback" );
-
-        goalStart( rollbackRequest.getReleaseManagerListener(), "rollback", rollbackPhases );
-
         for ( String name : rollbackPhases )
         {
             ReleasePhase phase = releasePhases.get( name );
@@ -301,12 +295,6 @@ private void perform( ReleasePerformRequest performRequest, ReleaseResult result
 
         goalStart( performRequest.getReleaseManagerListener(), "perform", performPhases );
 
-        Strategy releaseStrategy = getStrategy( releaseDescriptor.getReleaseStrategyId() );
-
-        List<String> performPhases = getGoalPhases( releaseStrategy, "perform" );
-
-        goalStart( performRequest.getReleaseManagerListener(), "perform", performPhases );
-
         for ( String name : performPhases )
         {
             ReleasePhase phase = releasePhases.get( name );
@@ -457,12 +445,6 @@ public ReleaseDescriptorBuilder addReleaseVersion( String key,
 
         goalStart( updateVersionsRequest.getReleaseManagerListener(), "updateVersions", updateVersionsPhases );
 
-        Strategy releaseStrategy = getStrategy( releaseDescriptor.getReleaseStrategyId() );
-
-        List<String> updateVersionsPhases = getGoalPhases( releaseStrategy, "updateVersions" );
-
-        goalStart( updateVersionsRequest.getReleaseManagerListener(), "updateVersions", updateVersionsPhases );
-
         for ( String name : updateVersionsPhases )
         {
             ReleasePhase phase = releasePhases.get( name );

diff --git a/...anager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorBuilder.java b/...anager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorBuilder.java
@@ -392,6 +392,18 @@ public ReleaseDescriptorBuilder addDependencyDevelopmentVersion( String dependen
         return this;
     }
 
+    public ReleaseDescriptorBuilder setAutoResolveSnapshotDependencies( boolean autoResolveSnapshotDependencies )
+    {
+        releaseDescriptor.setAutoResolveSnapshotDependencies( autoResolveSnapshotDependencies );
+        return this;
+    }
+
+    public ReleaseDescriptorBuilder setAutoResolveSnapshotDependenciesMode( int autoResolveSnapshotDependenciesMode )
+    {
+        releaseDescriptor.setAutoResolveSnapshotDependenciesMode( autoResolveSnapshotDependenciesMode );
+        return this;
+    }
+
     BuilderReleaseDescriptor build()
     {
         return releaseDescriptor;