[MRELEASE-1042] releaseProfiles get overriden by activeProfiles

apache · Apr 14, 2020 · b968279 · b968279
2 parents 0a4fb4d + 3efc999
commit b968279
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 0 deletions.
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
@@ -300,10 +300,25 @@ public void perform( ReleasePerformRequest performRequest )
     private void perform( ReleasePerformRequest performRequest, ReleaseResult result )
         throws ReleaseExecutionException, ReleaseFailureException
     {
+        List<String> specificProfiles =
+            ReleaseUtils.buildReleaseDescriptor( performRequest.getReleaseDescriptorBuilder() )
+            .getActivateProfiles();
+
         ReleaseDescriptor releaseDescriptor =
             loadReleaseDescriptor( performRequest.getReleaseDescriptorBuilder(),
                                    performRequest.getReleaseManagerListener() );
 
+        if ( specificProfiles != null && !specificProfiles.isEmpty() )
+        {
+            for ( String specificProfile : specificProfiles )
+            {
+                if ( !releaseDescriptor.getActivateProfiles().contains( specificProfile ) )
+                {
+                    releaseDescriptor.getActivateProfiles().add( specificProfile );
+                }
+            }
+        }
+
         Strategy releaseStrategy = getStrategy( releaseDescriptor.getReleaseStrategyId() );
 
         List<String> performPhases = getGoalPhases( releaseStrategy, "perform" );

diff --git a/...ease-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java b/...ease-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
@@ -30,6 +30,8 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
@@ -50,9 +52,11 @@
 import org.apache.maven.shared.release.config.ReleaseDescriptorStore;
 import org.apache.maven.shared.release.config.ReleaseDescriptorStoreException;
 import org.apache.maven.shared.release.config.ReleaseDescriptorStoreStub;
+import org.apache.maven.shared.release.config.ReleaseUtils;
 import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
 import org.apache.maven.shared.release.phase.ReleasePhase;
 import org.apache.maven.shared.release.phase.ReleasePhaseStub;
+import org.apache.maven.shared.release.phase.RunPerformGoalsPhase;
 import org.apache.maven.shared.release.scm.ReleaseScmCommandException;
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.util.FileUtils;
@@ -702,6 +706,38 @@ public void testScmResultFailure()
         }
     }
 
+    // MRELEASE-1042
+    public void testKeepProfilesOnPerform()
+            throws Exception
+    {
+        // prepare
+        ReleasePerformRequest performRequest = new ReleasePerformRequest();
+        performRequest.setDryRun( true );
+
+        ReleaseManagerListener managerListener = mock( ReleaseManagerListener.class );
+        performRequest.setReleaseManagerListener( managerListener );
+
+        ReleaseDescriptorBuilder builder = new ReleaseDescriptorBuilder();
+        builder.setActivateProfiles( Arrays.asList("aProfile", "anotherOne") );
+        builder.setWorkingDirectory( getTestFile( "target/working-directory" ).getAbsolutePath() );
+        performRequest.setReleaseDescriptorBuilder( builder );
+
+        DefaultReleaseManager releaseManager = (DefaultReleaseManager) lookup( ReleaseManager.class, "test" );
+
+        ReleaseDescriptorBuilder secondBuilder = new ReleaseDescriptorBuilder();
+        secondBuilder.setActivateProfiles( new ArrayList( Arrays.asList("aProfile", "bProfile") ) );
+        secondBuilder.setScmSourceUrl( "scm-url" );
+        ReleaseDescriptorStore configStoreMock = mock( ReleaseDescriptorStore.class );
+        when( configStoreMock.read( any( ReleaseDescriptorBuilder.class ) ) ).thenReturn( secondBuilder );
+        releaseManager.setConfigStore( configStoreMock );
+
+        // test
+        ReleaseResult result = releaseManager.performWithResult( performRequest );
+
+        // verify
+        assertTrue( result.getOutput().contains( "-P aProfile,bProfile,anotherOne" ) );
+    }
+
     public void testDetermineWorkingDirectory()
         throws Exception
     {