You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2020/03/12 07:42:33 UTC
[maven-release] branch master updated: [MRELEASE-1038]
releaseProfiles get overriden by exec.pomFileName
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git
The following commit(s) were added to refs/heads/master by this push:
new 9fade49 [MRELEASE-1038] releaseProfiles get overriden by exec.pomFileName
new 0db7d7a Merge pull request #38 from netceler/master
9fade49 is described below
commit 9fade4977c9e5654c5c920f2d92fb6b5c531be5e
Author: Benoit Guerin <bg...@netceler.com>
AuthorDate: Tue Feb 11 10:46:01 2020 +0100
[MRELEASE-1038] releaseProfiles get overriden by exec.pomFileName
---
.../org/apache/maven/shared/release/config/ReleaseUtils.java | 2 +-
.../apache/maven/shared/release/config/ReleaseUtilsTest.java | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
index 870f285..927278c 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
@@ -129,7 +129,7 @@ public class ReleaseUtils
}
if ( properties.containsKey( "exec.activateProfiles" ) )
{
- builder.setActivateProfiles( Arrays.asList( properties.getProperty( "exec.pomFileName" ).split( "," ) ) );
+ builder.setActivateProfiles( Arrays.asList( properties.getProperty( "exec.activateProfiles" ).split( "," ) ) );
}
if ( properties.containsKey( "preparationGoals" ) )
{
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java
index af3180d..22faa97 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java
@@ -28,6 +28,7 @@ import org.apache.maven.shared.release.phase.AbstractReleaseTestCase;
import java.io.File;
import java.io.IOException;
+import java.util.Arrays;
import java.util.Properties;
/**
@@ -249,6 +250,17 @@ public class ReleaseUtilsTest
properties.setProperty( "dependency.locations.enabled", "false" );
ReleaseUtils.copyPropertiesToReleaseDescriptor( properties, new ReleaseDescriptorBuilder() );
}
+
+ // MRELEASE-1038
+ public void testActiveProfilesProperty()
+ {
+ ReleaseDescriptorBuilder builder = new ReleaseDescriptorBuilder();
+ Properties properties = new Properties();
+ properties.setProperty( "exec.activateProfiles", "aProfile,anotherOne" );
+ ReleaseUtils.copyPropertiesToReleaseDescriptor( properties, builder );
+
+ assertEquals( Arrays.asList("aProfile", "anotherOne"), builder.build().getActivateProfiles() );
+ }
private static ReleaseDescriptorBuilder copyReleaseDescriptor( ReleaseDescriptor originalReleaseDescriptor )
{