This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MRELEASE-998
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit ec1dc653720609026248eb90495a97b713e7cf20
Author: rfscholte <rfscho...@apache.org>
AuthorDate: Sat Feb 10 14:25:22 2018 +0100
No need to merge anymore, all is done during reading
---
.../maven/shared/release/config/ReleaseUtils.java | 110 ---------------------
.../release/config/ReleaseDescriptorStoreStub.java | 3 +-
.../shared/release/config/ReleaseUtilsTest.java | 48 ---------
3 files changed, 1 insertion(+), 160 deletions(-)
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 c59e0fc..e49539c 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
@@ -46,116 +46,6 @@ public class ReleaseUtils
{
return builder.build();
}
-
- /**
- * Merge two descriptors together. All SCM settings are overridden by the
merge descriptor, as is the
- * <code>workingDirectory</code> field. The <code>completedPhase</code>
field is used as
- * a default from the merge descriptor, but not overridden if it exists.
- *
- * @param mergeInto the descriptor to be merged into
- * @param toBeMerged the descriptor to merge into mergeInto
- * @return ReleaseDescriptor the merged descriptor
- */
- static ReleaseDescriptorBuilder merge( ReleaseDescriptorBuilder
mergeIntoBuilder,
- ReleaseDescriptor toBeMerged
)
- {
- ReleaseDescriptor mergeInto = mergeIntoBuilder.build();
-
- // Overridden if configured from the caller
- mergeIntoBuilder.setScmId( mergeOverride( mergeInto.getScmId(),
toBeMerged.getScmId() ) );
- mergeIntoBuilder.setScmSourceUrl( mergeOverride(
mergeInto.getScmSourceUrl(), toBeMerged.getScmSourceUrl() ) );
- mergeIntoBuilder.setScmCommentPrefix(
- mergeOverride( mergeInto.getScmCommentPrefix(),
toBeMerged.getScmCommentPrefix() ) );
- mergeIntoBuilder.setScmReleaseLabel( mergeOverride(
mergeInto.getScmReleaseLabel(),
-
toBeMerged.getScmReleaseLabel() ) );
- mergeIntoBuilder.setScmTagBase( mergeOverride(
mergeInto.getScmTagBase(), toBeMerged.getScmTagBase() ) );
- mergeIntoBuilder.setScmTagNameFormat(
- mergeOverride( mergeInto.getScmTagNameFormat(),
toBeMerged.getScmTagNameFormat() ) );
- mergeIntoBuilder.setScmBranchBase( mergeOverride(
mergeInto.getScmBranchBase(),
-
toBeMerged.getScmBranchBase() ) );
- mergeIntoBuilder.setScmUsername( mergeOverride(
mergeInto.getScmUsername(), toBeMerged.getScmUsername() ) );
- mergeIntoBuilder.setScmPassword( mergeOverride(
mergeInto.getScmPassword(), toBeMerged.getScmPassword() ) );
- mergeIntoBuilder.setScmPrivateKey( mergeOverride(
mergeInto.getScmPrivateKey(),
-
toBeMerged.getScmPrivateKey() ) );
- mergeIntoBuilder.setScmPrivateKeyPassPhrase(
- mergeOverride( mergeInto.getScmPrivateKeyPassPhrase(),
toBeMerged.getScmPrivateKeyPassPhrase() ) );
- mergeIntoBuilder.setScmCommentPrefix(
- mergeOverride( mergeInto.getScmCommentPrefix(),
toBeMerged.getScmCommentPrefix() ) );
- mergeIntoBuilder.setAdditionalArguments(
- mergeOverride( mergeInto.getAdditionalArguments(),
toBeMerged.getAdditionalArguments() ) );
- mergeIntoBuilder.setPreparationGoals(
- mergeOverride( mergeInto.getPreparationGoals(),
toBeMerged.getPreparationGoals() ) );
- mergeIntoBuilder.setCompletionGoals(
- mergeOverride( mergeInto.getCompletionGoals(),
toBeMerged.getCompletionGoals() ) );
- mergeIntoBuilder.setPerformGoals( mergeOverride(
mergeInto.getPerformGoals(), toBeMerged.getPerformGoals() ) );
- mergeIntoBuilder.setPomFileName( mergeOverride(
mergeInto.getPomFileName(), toBeMerged.getPomFileName() ) );
- mergeIntoBuilder.setCheckModificationExcludes(
toBeMerged.getCheckModificationExcludes() );
- mergeIntoBuilder.setScmUseEditMode( toBeMerged.isScmUseEditMode() );
- mergeIntoBuilder.setAddSchema( toBeMerged.isAddSchema() );
- mergeIntoBuilder.setGenerateReleasePoms(
toBeMerged.isGenerateReleasePoms() );
- mergeIntoBuilder.setInteractive( toBeMerged.isInteractive() );
- mergeIntoBuilder.setUpdateDependencies(
toBeMerged.isUpdateDependencies() );
- mergeIntoBuilder.setCommitByProject( mergeOverride(
mergeInto.isCommitByProject(),
-
toBeMerged.isCommitByProject(),
- false ) );
- mergeIntoBuilder.setUseReleaseProfile(
toBeMerged.isUseReleaseProfile() );
- mergeIntoBuilder.setBranchCreation( toBeMerged.isBranchCreation() );
- mergeIntoBuilder.setUpdateBranchVersions(
toBeMerged.isUpdateBranchVersions() );
- mergeIntoBuilder.setUpdateWorkingCopyVersions(
toBeMerged.isUpdateWorkingCopyVersions() );
- mergeIntoBuilder.setSuppressCommitBeforeTagOrBranch(
toBeMerged.isSuppressCommitBeforeTagOrBranch() );
- mergeIntoBuilder.setUpdateVersionsToSnapshot(
toBeMerged.isUpdateVersionsToSnapshot() );
- mergeIntoBuilder.setAllowTimestampedSnapshots(
toBeMerged.isAllowTimestampedSnapshots() );
- mergeIntoBuilder.setSnapshotReleasePluginAllowed(
toBeMerged.isSnapshotReleasePluginAllowed() );
- mergeIntoBuilder.setAutoVersionSubmodules(
toBeMerged.isAutoVersionSubmodules() );
- mergeIntoBuilder.setDefaultReleaseVersion( mergeOverride(
mergeInto.getDefaultReleaseVersion(),
-
toBeMerged.getDefaultReleaseVersion() ) );
- mergeIntoBuilder.setDefaultDevelopmentVersion( mergeOverride(
mergeInto.getDefaultDevelopmentVersion(),
-
toBeMerged.getDefaultDevelopmentVersion() ) );
- mergeIntoBuilder.setRemoteTagging( toBeMerged.isRemoteTagging() );
- mergeIntoBuilder.setLocalCheckout( toBeMerged.isLocalCheckout() );
- mergeIntoBuilder.setPushChanges( toBeMerged.isPushChanges() );
- mergeIntoBuilder.setWaitBeforeTagging(
toBeMerged.getWaitBeforeTagging() );
-
- for ( Entry<String, ReleaseStageVersions> versions :
toBeMerged.getProjectVersions().entrySet() )
- {
- mergeIntoBuilder.addReleaseVersion( versions.getKey(),
versions.getValue().getRelease() );
- mergeIntoBuilder.addDevelopmentVersion( versions.getKey(),
versions.getValue().getDevelopment() );
- }
-
- // These must be overridden, as they are not stored
- mergeIntoBuilder.setWorkingDirectory(
- mergeOverride( mergeInto.getWorkingDirectory(),
toBeMerged.getWorkingDirectory() ) );
- mergeIntoBuilder.setCheckoutDirectory(
- mergeOverride( mergeInto.getCheckoutDirectory(),
toBeMerged.getCheckoutDirectory() ) );
-
- // Not overridden - not configured from caller
- mergeIntoBuilder.setCompletedPhase( mergeDefault(
mergeInto.getCompletedPhase(),
-
toBeMerged.getCompletedPhase() ) );
-
- mergeIntoBuilder.setProjectVersionPolicyId( mergeDefault(
mergeInto.getProjectVersionPolicyId(),
-
toBeMerged.getProjectVersionPolicyId() ) );
- mergeIntoBuilder.setProjectNamingPolicyId( mergeDefault(
mergeInto.getProjectNamingPolicyId(),
-
toBeMerged.getProjectNamingPolicyId() ) );
- mergeIntoBuilder.setReleaseStrategyId( mergeOverride(
mergeInto.getReleaseStrategyId(),
-
toBeMerged.getReleaseStrategyId() ) );
-
- return mergeIntoBuilder;
- }
-
- private static String mergeOverride( String thisValue, String mergeValue )
- {
- return mergeValue != null ? mergeValue : thisValue;
- }
-
- private static String mergeDefault( String thisValue, String mergeValue )
- {
- return thisValue != null ? thisValue : mergeValue;
- }
-
- private static boolean mergeOverride( boolean thisValue, boolean
mergeValue, boolean defaultValue )
- {
- return mergeValue != defaultValue ? mergeValue : thisValue;
- }
public static void copyPropertiesToReleaseDescriptor( Properties
properties, ReleaseDescriptorBuilder builder )
{
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseDescriptorStoreStub.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseDescriptorStoreStub.java
index 6ebfcd9..1352d28 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseDescriptorStoreStub.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseDescriptorStoreStub.java
@@ -35,8 +35,7 @@ public class ReleaseDescriptorStoreStub
@Override
public ReleaseDescriptorBuilder read( ReleaseDescriptorBuilder
mergeDescriptor )
{
- ReleaseUtils.merge( releaseDescriptor, mergeDescriptor.build() );
- return releaseDescriptor;
+ return mergeDescriptor;
}
@Override
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 a54c13e..e7d35d9 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
@@ -37,54 +37,6 @@ import java.util.Properties;
public class ReleaseUtilsTest
extends TestCase
{
- public void testMergeConfigurationSourceEmpty()
- throws IOException
- {
- ReleaseDescriptorBuilder mergeDescriptor = createReleaseDescriptor();
- ReleaseDescriptorBuilder releaseDescriptor = new
ReleaseDescriptorBuilder();
- ReleaseDescriptor mergedReleaseDescriptor = ReleaseUtils.merge(
releaseDescriptor, mergeDescriptor.build() ).build();
- ReleaseDescriptor mergedMergeDescriptor = ReleaseUtils.merge(
mergeDescriptor, releaseDescriptor.build() ).build();
-
- assertEquals( "Check merge", mergedReleaseDescriptor,
mergedMergeDescriptor );
- }
-
- public void testMergeEqualsWithUpdateWorkingCopyTrue()
- throws IOException
- {
- ReleaseDescriptorBuilder mergeDescriptor = createReleaseDescriptor();
- ReleaseDescriptorBuilder releaseDescriptor = new
ReleaseDescriptorBuilder();
-
- ReleaseDescriptor mergedReleaseDescriptor = ReleaseUtils.merge(
releaseDescriptor, mergeDescriptor.build() ).build();
- ReleaseDescriptor mergedMergeDescriptor = ReleaseUtils.merge(
mergeDescriptor, releaseDescriptor.build() ).build();
-
- assertEquals( "Check merge", mergedReleaseDescriptor,
mergedMergeDescriptor );
- }
-
- public void testMergeConfigurationDestEmpty()
- throws IOException
- {
- ReleaseDescriptorBuilder releaseDescriptor = createReleaseDescriptor();
- ReleaseDescriptor mergedReleaseDescriptor = ReleaseUtils.merge(
releaseDescriptor, new ReleaseDescriptorBuilder().build() ).build();
- ReleaseDescriptor expectedDescriptor = copyReleaseDescriptor(
mergedReleaseDescriptor ).build();
-
- assertEquals( "Check merge", expectedDescriptor,
releaseDescriptor.build() );
- }
-
- public void testMergeConfiguration()
- throws IOException
- {
- File workingDirectory = new File( "." );
-
- ReleaseDescriptor mergeDescriptor =
- createMergeDescriptor( AbstractReleaseTestCase.getPath(
workingDirectory ), "completed-phase-merge" ).build();
-
- ReleaseDescriptor releaseDescriptor = ReleaseUtils.merge(
createReleaseDescriptor(), mergeDescriptor ).build();
-
- ReleaseDescriptor expected =
- createMergeDescriptor( releaseDescriptor.getWorkingDirectory(),
releaseDescriptor.getCompletedPhase() ).build();
- assertEquals( "Check merge", expected, releaseDescriptor );
- }
-
public void testEquals()
throws IOException
{
--
To stop receiving notification emails like this one, please contact
rfscho...@apache.org.
