You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2018/02/10 16:03:05 UTC
[maven-release] 17/21: Manage dependencies just like project
versions
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 346dc31528162502746c6d355e088f42ba933d75
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Feb 10 13:55:39 2018 +0100
Manage dependencies just like project versions
---
.../release/config/ReleaseDescriptorBuilder.java | 33 ++++++-----
.../maven/shared/release/config/ReleaseUtils.java | 23 +-------
.../phase/CheckDependencySnapshotsPhase.java | 10 ++--
.../src/main/mdo/release-descriptor.mdo | 40 ++++++-------
.../PropertiesReleaseDescriptorStoreTest.java | 6 +-
.../shared/release/config/ReleaseUtilsTest.java | 12 ++--
.../phase/CheckDependencySnapshotsPhaseTest.java | 69 ++++++++--------------
.../phase/RewritePomsForReleasePhaseTest.java | 6 +-
8 files changed, 78 insertions(+), 121 deletions(-)
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorBuilder.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorBuilder.java
index 1e7fc1e..b7ec376 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorBuilder.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorBuilder.java
@@ -38,20 +38,6 @@ public class ReleaseDescriptorBuilder
*/
static final class BuilderReleaseDescriptor extends ReleaseDescriptor implements ReleaseDescriptorNew
{
-
- @Override
- public void addDependencyReleaseVersion( String artifactKey, String version )
- {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void addDependencyDevelopmentVersion( String artifactKey, String version )
- {
- // TODO Auto-generated method stub
-
- }
}
private final BuilderReleaseDescriptor releaseDescriptor;
@@ -383,6 +369,25 @@ public class ReleaseDescriptorBuilder
{
releaseDescriptor.addOriginalVersion( projectKey, version );
}
+
+ public ReleaseDescriptorBuilder addDependencyOriginalVersion( String dependencyKey, String version )
+ {
+ releaseDescriptor.addDependencyOriginalVersion( dependencyKey, version );
+ return this;
+
+ }
+
+ public ReleaseDescriptorBuilder addDependencyReleaseVersion( String dependencyKey, String version )
+ {
+ releaseDescriptor.addDependencyReleaseVersion( dependencyKey, version );
+ return this;
+ }
+
+ public ReleaseDescriptorBuilder addDependencyDevelopmentVersion( String dependencyKey, String version )
+ {
+ releaseDescriptor.addDependencyDevelopmentVersion( dependencyKey, version );
+ return this;
+ }
BuilderReleaseDescriptor build()
{
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 8b7322a..c59e0fc 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
@@ -19,9 +19,7 @@ package org.apache.maven.shared.release.config;
* under the License.
*/
-import java.util.HashMap;
import java.util.Iterator;
-import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
@@ -39,8 +37,6 @@ public class ReleaseUtils
private static final String RELEASE_KEY = "rel";
- private static final String ORIGINAL_VERSION = "original";
-
private ReleaseUtils()
{
// nothing to see here
@@ -309,8 +305,6 @@ public class ReleaseUtils
private static void loadResolvedDependencies( Properties prop, ReleaseDescriptorBuilder builder )
{
- Map<String, ReleaseStageVersions> resolvedDependencies = new HashMap<>();
-
Set entries = prop.entrySet();
Iterator<Entry<String, String>> iterator = entries.iterator();
String propertyName;
@@ -323,7 +317,6 @@ public class ReleaseUtils
if ( propertyName.startsWith( "dependency." ) )
{
- ReleaseStageVersions versionMap = new ReleaseStageVersions();
String artifactVersionlessKey;
int startIndex = "dependency.".length();
int endIndex;
@@ -347,28 +340,16 @@ public class ReleaseUtils
artifactVersionlessKey = propertyName.substring( startIndex, endIndex );
- if ( resolvedDependencies.containsKey( artifactVersionlessKey ) )
- {
- versionMap = resolvedDependencies.get( artifactVersionlessKey );
- }
- else
- {
- versionMap = new ReleaseStageVersions();
- resolvedDependencies.put( artifactVersionlessKey, versionMap );
- }
-
if ( RELEASE_KEY.equals( versionType ) )
{
- versionMap.setRelease( currentEntry.getValue() );
+ builder.addDependencyReleaseVersion( artifactVersionlessKey, currentEntry.getValue() );
}
else if ( DEVELOPMENT_KEY.equals( versionType ) )
{
- versionMap.setDevelopment( currentEntry.getValue() );
+ builder.addDependencyDevelopmentVersion( artifactVersionlessKey, currentEntry.getValue() );
}
}
}
-
- builder.build().setResolvedSnapshotDependencies( resolvedDependencies );
}
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
index e7bcfc6..4dd43b7 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
@@ -36,7 +36,6 @@ import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseFailureException;
import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
-import org.apache.maven.shared.release.config.ReleaseStageVersions;
import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.versions.DefaultVersionInfo;
import org.apache.maven.shared.release.versions.VersionInfo;
@@ -426,15 +425,15 @@ public class CheckDependencySnapshotsPhase
Artifact currentArtifact = iterator.next();
String versionlessKey = ArtifactUtils.versionlessKey( currentArtifact );
- ReleaseStageVersions versionMap = new ReleaseStageVersions();
VersionInfo versionInfo = new DefaultVersionInfo( currentArtifact.getBaseVersion() );
- versionMap.setOriginal( versionInfo.toString() );
+ releaseDescriptor.addDependencyOriginalVersion( versionlessKey, versionInfo.toString() );
prompter.showMessage(
"Dependency '" + versionlessKey + "' is a snapshot (" + currentArtifact.getVersion() + ")\n" );
String result = prompter.prompt( "Which release version should it be set to?",
versionInfo.getReleaseVersionString() );
- versionMap.setRelease( result );
+
+ releaseDescriptor.addDependencyReleaseVersion( versionlessKey, result );
iterator.remove();
@@ -453,9 +452,8 @@ public class CheckDependencySnapshotsPhase
}
result = prompter.prompt( "What version should the dependency be reset to for development?", nextVersion );
- versionMap.setDevelopment( result );
- releaseDescriptor.getResolvedSnapshotDependencies().put( versionlessKey, versionMap );
+ releaseDescriptor.addDependencyDevelopmentVersion( versionlessKey, result );
}
}
}
\ No newline at end of file
diff --git a/maven-release-manager/src/main/mdo/release-descriptor.mdo b/maven-release-manager/src/main/mdo/release-descriptor.mdo
index 1b86f65..b184582 100644
--- a/maven-release-manager/src/main/mdo/release-descriptor.mdo
+++ b/maven-release-manager/src/main/mdo/release-descriptor.mdo
@@ -538,7 +538,7 @@
/**
* Field resolvedSnapshotDependencies.
*/
- private java.util.Map<String, ReleaseStageVersions> resolvedSnapshotDependencies;
+ private java.util.Map<String, ReleaseStageVersions> resolvedSnapshotDependencies = new java.util.HashMap<>();
/**
* Field projectVersions
@@ -566,25 +566,10 @@
*
* @return Map
*/
- public java.util.Map<String, ReleaseStageVersions> getResolvedSnapshotDependencies()
+ java.util.Map<String, ReleaseStageVersions> getResolvedSnapshotDependencies()
{
- if ( this.resolvedSnapshotDependencies == null )
- {
- this.resolvedSnapshotDependencies = new java.util.HashMap<>();
- }
-
return this.resolvedSnapshotDependencies;
} //-- java.util.Map<String, ReleaseStageVersions> getResolvedSnapshotDependencies()
-
- /**
- * Set a map of resolved snapshot dependencies versions.
- *
- * @param resolvedSnapshotDependencies
- */
- public void setResolvedSnapshotDependencies( java.util.Map<String, ReleaseStageVersions> resolvedSnapshotDependencies )
- {
- this.resolvedSnapshotDependencies = resolvedSnapshotDependencies;
- } //-- void setResolvedSnapshotDependencies( java.util.Map<String, ReleaseStageVersions> )
public String getProjectReleaseVersion( String projectId )
{
@@ -667,7 +652,7 @@
*/
public String getDependencyDevelopmentVersion( String artifactConflictId )
{
- if ( resolvedSnapshotDependencies != null && resolvedSnapshotDependencies.containsKey( artifactConflictId ) )
+ if ( resolvedSnapshotDependencies.containsKey( artifactConflictId ) )
{
ReleaseStageVersions versionMap = resolvedSnapshotDependencies.get( artifactConflictId );
return versionMap.getDevelopment();
@@ -681,7 +666,7 @@
*/
public String getDependencyReleaseVersion( String artifactConflictId )
{
- if ( resolvedSnapshotDependencies != null && resolvedSnapshotDependencies.containsKey( artifactConflictId ) )
+ if ( resolvedSnapshotDependencies.containsKey( artifactConflictId ) )
{
ReleaseStageVersions versionMap = resolvedSnapshotDependencies.get( artifactConflictId );
return versionMap.getRelease();
@@ -695,7 +680,7 @@
*/
public String getDependencyOriginalVersion( String artifactConflictId )
{
- if ( resolvedSnapshotDependencies != null && resolvedSnapshotDependencies.containsKey( artifactConflictId ) )
+ if ( resolvedSnapshotDependencies.containsKey( artifactConflictId ) )
{
ReleaseStageVersions versionMap = resolvedSnapshotDependencies.get( artifactConflictId );
return versionMap.getOriginal();
@@ -703,6 +688,21 @@
return null;
}
+ public void addDependencyOriginalVersion( String dependencyKey, String version )
+ {
+ computeIfAbsent( resolvedSnapshotDependencies, dependencyKey ).setOriginal( version );
+ }
+
+ public void addDependencyReleaseVersion( String dependencyKey, String version )
+ {
+ computeIfAbsent( resolvedSnapshotDependencies, dependencyKey ).setRelease( version );
+ }
+
+ public void addDependencyDevelopmentVersion( String dependencyKey, String version )
+ {
+ computeIfAbsent( resolvedSnapshotDependencies, dependencyKey ).setDevelopment( version );
+ }
+
private static ReleaseStageVersions computeIfAbsent( java.util.Map<String, ReleaseStageVersions> map, String key )
{
ReleaseStageVersions value = map.get( key );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java
index b33046f..3bce7c3 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java
@@ -437,10 +437,8 @@ public class PropertiesReleaseDescriptorStoreTest
scm.setTag( null );
scm.setDeveloperConnection( null );
builder.addOriginalScmInfo( "groupId:artifactId2", scm );
- ReleaseStageVersions versions = new ReleaseStageVersions();
- versions.setRelease( "1.0" );
- versions.setDevelopment( "1.1-SNAPSHOT" );
- builder.build().getResolvedSnapshotDependencies().put( "external:artifactId", versions );
+ builder.addDependencyReleaseVersion( "external:artifactId", "1.0" );
+ builder.addDependencyDevelopmentVersion( "external:artifactId", "1.1-SNAPSHOT" );
return builder;
}
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 746a9f2..a54c13e 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
@@ -263,9 +263,8 @@ public class ReleaseUtilsTest
ReleaseUtils.copyPropertiesToReleaseDescriptor( properties, builder );
ReleaseDescriptor descriptor = builder.build();
- ReleaseStageVersions versionMap = descriptor.getResolvedSnapshotDependencies().get( dependencyKey );
- assertEquals( "1.3", versionMap.getRelease() );
- assertEquals( "1.3-SNAPSHOT", versionMap.getDevelopment() );
+ assertEquals( "1.3", descriptor.getDependencyReleaseVersion( dependencyKey ) );
+ assertEquals( "1.3-SNAPSHOT", descriptor.getDependencyDevelopmentVersion( dependencyKey ) );
}
// MRELEASE-750
@@ -281,11 +280,8 @@ public class ReleaseUtilsTest
ReleaseUtils.copyPropertiesToReleaseDescriptor( properties, builder );
ReleaseDescriptor descriptor = builder.build();
- ReleaseStageVersions versionMap = descriptor.getResolvedSnapshotDependencies().get( relDependencyKey );
- assertEquals( "1.3", versionMap.getRelease() );
-
- versionMap = descriptor.getResolvedSnapshotDependencies().get( devDependencyKey );
- assertEquals( "1.3-SNAPSHOT", versionMap.getDevelopment() );
+ assertEquals( "1.3", descriptor.getDependencyReleaseVersion( relDependencyKey ) );
+ assertEquals( "1.3-SNAPSHOT", descriptor.getDependencyDevelopmentVersion( devDependencyKey ) );
}
// MRELEASE-834
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java
index c465f51..2b0edf6 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java
@@ -31,14 +31,13 @@ import static org.mockito.Mockito.when;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import java.util.Map;
import java.util.Objects;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseFailureException;
+import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.config.ReleaseDescriptorBuilder;
-import org.apache.maven.shared.release.config.ReleaseStageVersions;
import org.apache.maven.shared.release.config.ReleaseUtils;
import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
import org.codehaus.plexus.components.interactivity.Prompter;
@@ -501,11 +500,10 @@ public class CheckDependencySnapshotsPhaseTest
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
// validate
- ReleaseStageVersions versionsMap = ReleaseUtils.buildReleaseDescriptor( builder ).getResolvedSnapshotDependencies().get( "external:artifactId" );
-
- assertNotNull( versionsMap );
- assertEquals( "1.1-SNAPSHOT", versionsMap.getDevelopment() );
- assertEquals( "1.0", versionsMap.getRelease() );
+ ReleaseDescriptor descriptor = ReleaseUtils.buildReleaseDescriptor( builder );
+
+ assertEquals( "1.0", descriptor.getDependencyReleaseVersion( "external:artifactId" ) );
+ assertEquals( "1.1-SNAPSHOT", descriptor.getDependencyDevelopmentVersion( "external:artifactId" ) );
builder = createReleaseDescriptorBuilder( reactorProjects );
@@ -530,11 +528,10 @@ public class CheckDependencySnapshotsPhaseTest
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
// validate
- ReleaseStageVersions versionsMap = ReleaseUtils.buildReleaseDescriptor( builder ).getResolvedSnapshotDependencies().get( "external:artifactId" );
+ ReleaseDescriptor descriptor = ReleaseUtils.buildReleaseDescriptor( builder );
- assertNotNull( versionsMap );
- assertEquals( "1.0-SNAPSHOT", versionsMap.getDevelopment() );
- assertEquals( "0.9", versionsMap.getRelease() );
+ assertEquals( "0.9", descriptor.getDependencyReleaseVersion( "external:artifactId" ) );
+ assertEquals( "1.0-SNAPSHOT", descriptor.getDependencyDevelopmentVersion( "external:artifactId" ) );
}
@Test
@@ -552,11 +549,10 @@ public class CheckDependencySnapshotsPhaseTest
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
// validate
- ReleaseStageVersions versionsMap = ReleaseUtils.buildReleaseDescriptor( builder ).getResolvedSnapshotDependencies().get( "external:artifactId" );
+ ReleaseDescriptor descriptor = ReleaseUtils.buildReleaseDescriptor( builder );
- assertNotNull( versionsMap );
- assertEquals( "1.0", versionsMap.getDevelopment() );
- assertEquals( "1.0", versionsMap.getRelease() );
+ assertEquals( "1.0", descriptor.getDependencyReleaseVersion( "external:artifactId" ) );
+ assertEquals( "1.0", descriptor.getDependencyDevelopmentVersion( "external:artifactId" ) );
}
@Test
@@ -574,11 +570,10 @@ public class CheckDependencySnapshotsPhaseTest
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
// validate
- ReleaseStageVersions versionsMap = ReleaseUtils.buildReleaseDescriptor( builder ).getResolvedSnapshotDependencies().get( "external:artifactId" );
+ ReleaseDescriptor descriptor = ReleaseUtils.buildReleaseDescriptor( builder );
- assertNotNull( versionsMap );
- assertEquals( "1.0", versionsMap.getDevelopment() );
- assertEquals( "1.0", versionsMap.getRelease() );
+ assertEquals( "1.0", descriptor.getDependencyReleaseVersion( "external:artifactId" ) );
+ assertEquals( "1.0", descriptor.getDependencyDevelopmentVersion( "external:artifactId" ) );
}
@Test
@@ -600,11 +595,10 @@ public class CheckDependencySnapshotsPhaseTest
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
// validate
- ReleaseStageVersions versionsMap = ReleaseUtils.buildReleaseDescriptor( builder ).getResolvedSnapshotDependencies().get( "external:artifactId" );
+ ReleaseDescriptor descriptor = ReleaseUtils.buildReleaseDescriptor( builder );
- assertNotNull( versionsMap );
- assertEquals( "1.0", versionsMap.getDevelopment() );
- assertEquals( "1.0", versionsMap.getRelease() );
+ assertEquals( "1.0", descriptor.getDependencyReleaseVersion( "external:artifactId" ) );
+ assertEquals( "1.0", descriptor.getDependencyDevelopmentVersion( "external:artifactId" ) );
}
// MRELEASE-589
@@ -627,25 +621,13 @@ public class CheckDependencySnapshotsPhaseTest
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
- Map<String, ReleaseStageVersions> resolvedDependencies = ReleaseUtils.buildReleaseDescriptor( builder ).getResolvedSnapshotDependencies();
-
- assertNotNull( resolvedDependencies );
- assertEquals( 2, resolvedDependencies.size() );
-
- assertTrue( resolvedDependencies.containsKey( "external:artifactId" ) );
- assertTrue( resolvedDependencies.containsKey( "external:artifactId2" ) );
-
- ReleaseStageVersions versionsMap = ReleaseUtils.buildReleaseDescriptor( builder ).getResolvedSnapshotDependencies().get( "external:artifactId" );
-
- assertNotNull( versionsMap );
- assertEquals( "1.1-SNAPSHOT", versionsMap.getDevelopment() );
- assertEquals( "1.0", versionsMap.getRelease() );
+ ReleaseDescriptor descriptor = ReleaseUtils.buildReleaseDescriptor( builder );
- versionsMap = ReleaseUtils.buildReleaseDescriptor( builder ).getResolvedSnapshotDependencies().get( "external:artifactId2" );
+ assertEquals( "1.0", descriptor.getDependencyReleaseVersion( "external:artifactId" ) );
+ assertEquals( "1.1-SNAPSHOT", descriptor.getDependencyDevelopmentVersion( "external:artifactId" ) );
- assertNotNull( versionsMap );
- assertEquals( "1.1-SNAPSHOT", versionsMap.getDevelopment() );
- assertEquals( "1.0", versionsMap.getRelease() );
+ assertEquals( "1.0", descriptor.getDependencyReleaseVersion( "external:artifactId2" ) );
+ assertEquals( "1.1-SNAPSHOT", descriptor.getDependencyDevelopmentVersion( "external:artifactId2" ) );
}
@Test
@@ -1031,11 +1013,10 @@ public class CheckDependencySnapshotsPhaseTest
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
// validate
- ReleaseStageVersions versionsMap = ReleaseUtils.buildReleaseDescriptor( builder ).getResolvedSnapshotDependencies().get( "groupId:parent-external" );
+ ReleaseDescriptor descriptor = ReleaseUtils.buildReleaseDescriptor( builder );
- assertNotNull( versionsMap );
- assertEquals( "1.0-test", versionsMap.getDevelopment() );
- assertEquals( "1.0-test", versionsMap.getRelease() );
+ assertEquals( "1.0-test", descriptor.getDependencyReleaseVersion( "groupId:parent-external" ) );
+ assertEquals( "1.0-test", descriptor.getDependencyDevelopmentVersion( "groupId:parent-external" ) );
}
@Test
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
index db2fac3..d81b7a5 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
@@ -449,10 +449,8 @@ public class RewritePomsForReleasePhaseTest
List<MavenProject> reactorProjects = createReactorProjects( "pom-with-externally-released-parent" );
ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects );
- ReleaseStageVersions versions = new ReleaseStageVersions();
- versions.setRelease( "1" );
- versions.setDevelopment( "2-SNAPSHOT" );
- ReleaseUtils.buildReleaseDescriptor( builder ).getResolvedSnapshotDependencies().put( "external:parent-artifactId", versions );
+ builder.addDependencyReleaseVersion( "external:parent-artifactId", "1" );
+ builder.addDependencyDevelopmentVersion( "external:parent-artifactId", "2-SNAPSHOT" );
builder.addReleaseVersion( "groupId:subproject1", ALTERNATIVE_NEXT_VERSION );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
--
To stop receiving notification emails like this one, please contact
rfscholte@apache.org.