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 a207bf6a6b50212c7787eaec83d67b02a25a67e2
Author: rfscholte <rfscho...@apache.org>
AuthorDate: Sun Jan 21 21:15:03 2018 +0100
Make usage of resolvedDependencies more clear
---
.../config/PropertiesReleaseDescriptorStore.java | 10 +-
.../maven/shared/release/config/ReleaseUtils.java | 17 +-
.../release/phase/AbstractRewritePomsPhase.java | 15 +-
.../phase/CheckDependencySnapshotsPhase.java | 15 +-
.../release/phase/RewritePomVersionsPhase.java | 3 +-
.../release/phase/RewritePomsForBranchPhase.java | 7 +-
.../phase/RewritePomsForDevelopmentPhase.java | 7 +-
.../release/phase/RewritePomsForReleasePhase.java | 7 +-
.../src/main/mdo/release-descriptor.mdo | 245 +++++++++++----------
.../shared/release/config/ReleaseUtilsTest.java | 13 +-
.../phase/CheckDependencySnapshotsPhaseTest.java | 49 +++--
11 files changed, 207 insertions(+), 181 deletions(-)
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
index 7256ce3..a013226 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
@@ -290,16 +290,16 @@ public class PropertiesReleaseDescriptorStore
}
}
- private void processResolvedDependencies( Properties prop, Map<String,
Map<String, String>> resolvedDependencies )
+ private void processResolvedDependencies( Properties prop, Map<String,
DependencyVersions> resolvedDependencies )
{
- for ( Map.Entry<String, Map<String, String>> currentEntry :
resolvedDependencies.entrySet() )
+ for ( Map.Entry<String, DependencyVersions> currentEntry :
resolvedDependencies.entrySet() )
{
- Map<String, String> versionMap = currentEntry.getValue();
+ DependencyVersions versionMap = currentEntry.getValue();
prop.setProperty( "dependency." + currentEntry.getKey() +
".release",
- versionMap.get( ReleaseDescriptor.RELEASE_KEY )
);
+ versionMap.getRelease() );
prop.setProperty( "dependency." + currentEntry.getKey() +
".development",
- versionMap.get(
ReleaseDescriptor.DEVELOPMENT_KEY ) );
+ versionMap.getDevelopment() );
}
}
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 743b062..90f1227 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
@@ -231,7 +231,7 @@ public class ReleaseUtils
private static void loadResolvedDependencies( Properties prop,
ReleaseDescriptor descriptor )
{
- Map<String, Map<String, String>> resolvedDependencies = new
HashMap<>();
+ Map<String, DependencyVersions> resolvedDependencies = new HashMap<>();
Set entries = prop.entrySet();
Iterator<Entry<String, String>> iterator = entries.iterator();
@@ -245,14 +245,12 @@ public class ReleaseUtils
if ( propertyName.startsWith( "dependency." ) )
{
- Map<String, String> versionMap;
+ DependencyVersions versionMap = new DependencyVersions();
String artifactVersionlessKey;
int startIndex = "dependency.".length();
int endIndex;
String versionType;
- versionMap = new HashMap<>();
-
if ( propertyName.indexOf( ".development" ) != -1 )
{
endIndex = propertyName.lastIndexOf( ".development" );
@@ -277,11 +275,18 @@ public class ReleaseUtils
}
else
{
- versionMap = new HashMap<>();
+ versionMap = new DependencyVersions();
resolvedDependencies.put( artifactVersionlessKey,
versionMap );
}
- versionMap.put( versionType, currentEntry.getValue() );
+ if ( ReleaseDescriptor.RELEASE_KEY.equals( versionType ) )
+ {
+ versionMap.setRelease( currentEntry.getValue() );
+ }
+ else if ( ReleaseDescriptor.DEVELOPMENT_KEY.equals(
versionType ) )
+ {
+ versionMap.setDevelopment( currentEntry.getValue() );
+ }
}
}
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
index 6fd4cb6..5221e4e 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
@@ -47,6 +47,7 @@ import org.apache.maven.scm.repository.ScmRepositoryException;
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.DependencyVersions;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.scm.IdentifiedScm;
@@ -241,7 +242,7 @@ public abstract class AbstractRewritePomsPhase
{
Map<String, String> mappedVersions = getNextVersionMap(
releaseDescriptor );
Map<String, String> originalVersions = getOriginalVersionMap(
releaseDescriptor, reactorProjects, simulate );
- Map<String, Map<String, String>> resolvedSnapshotDependencies =
+ Map<String, DependencyVersions> resolvedSnapshotDependencies =
releaseDescriptor.getResolvedSnapshotDependencies();
Model model = project.getModel();
@@ -374,7 +375,7 @@ public abstract class AbstractRewritePomsPhase
}
private String rewriteParent( MavenProject project, Model targetModel,
Map<String, String> mappedVersions,
- Map<String, Map<String, String>>
resolvedSnapshotDependencies,
+ Map<String, DependencyVersions>
resolvedSnapshotDependencies,
Map<String, String> originalVersions )
throws ReleaseFailureException
{
@@ -405,7 +406,7 @@ public abstract class AbstractRewritePomsPhase
}
private void rewriteArtifactVersions( Collection<MavenCoordinate>
elements, Map<String, String> mappedVersions,
- Map<String, Map<String, String>>
resolvedSnapshotDependencies,
+ Map<String, DependencyVersions>
resolvedSnapshotDependencies,
Map<String, String>
originalVersions, Model projectModel,
Properties properties, ReleaseResult
result,
ReleaseDescriptor releaseDescriptor )
@@ -579,7 +580,7 @@ public abstract class AbstractRewritePomsPhase
protected abstract String getResolvedSnapshotVersion( String
artifactVersionlessKey,
- Map<String,
Map<String, String>> resolvedSnapshots );
+ Map<String,
DependencyVersions> resolvedSnapshots );
protected abstract Map<String, String> getOriginalVersionMap(
ReleaseDescriptor releaseDescriptor,
List<MavenProject> reactorProjects,
@@ -603,13 +604,13 @@ public abstract class AbstractRewritePomsPhase
}
protected String getOriginalResolvedSnapshotVersion( String
artifactVersionlessKey,
- Map<String,
Map<String, String>> resolvedSnapshots )
+ Map<String,
DependencyVersions> resolvedSnapshots )
{
- Map<String, String> versionsMap = resolvedSnapshots.get(
artifactVersionlessKey );
+ DependencyVersions versionsMap = resolvedSnapshots.get(
artifactVersionlessKey );
if ( versionsMap != null )
{
- return versionsMap.get( ReleaseDescriptor.ORIGINAL_VERSION );
+ return versionsMap.getOriginal();
}
else
{
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 cc762c9..a1f5ce4 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,6 +36,7 @@ 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.ReleaseResult;
+import org.apache.maven.shared.release.config.DependencyVersions;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.versions.DefaultVersionInfo;
@@ -368,7 +369,7 @@ public class CheckDependencySnapshotsPhase
if ( resolveSnapshot.toLowerCase( Locale.ENGLISH ).startsWith( "y"
) )
{
- Map<String, Map<String, String>> resolvedSnapshots = null;
+ Map<String, DependencyVersions> resolvedSnapshots = null;
if ( resolveSnapshotType == null )
{
@@ -419,10 +420,10 @@ public class CheckDependencySnapshotsPhase
}
}
- private Map<String, Map<String, String>> processSnapshot( Set<Artifact>
snapshotSet )
+ private Map<String, DependencyVersions> processSnapshot( Set<Artifact>
snapshotSet )
throws PrompterException, VersionParseException
{
- Map<String, Map<String, String>> resolvedSnapshots = new HashMap<>();
+ Map<String, DependencyVersions> resolvedSnapshots = new HashMap<>();
Iterator<Artifact> iterator = snapshotSet.iterator();
while ( iterator.hasNext() )
@@ -430,15 +431,15 @@ public class CheckDependencySnapshotsPhase
Artifact currentArtifact = iterator.next();
String versionlessKey = ArtifactUtils.versionlessKey(
currentArtifact );
- Map<String, String> versionMap = new HashMap<>();
+ DependencyVersions versionMap = new DependencyVersions();
VersionInfo versionInfo = new DefaultVersionInfo(
currentArtifact.getBaseVersion() );
- versionMap.put( ReleaseDescriptor.ORIGINAL_VERSION,
versionInfo.toString() );
+ versionMap.setOriginal( 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.put( ReleaseDescriptor.RELEASE_KEY, result );
+ versionMap.setRelease( result );
iterator.remove();
@@ -457,7 +458,7 @@ public class CheckDependencySnapshotsPhase
}
result = prompter.prompt( "What version should the dependency be
reset to for development?", nextVersion );
- versionMap.put( ReleaseDescriptor.DEVELOPMENT_KEY, result );
+ versionMap.setDevelopment( result );
resolvedSnapshots.put( versionlessKey, versionMap );
}
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
index 2ed4376..56638be 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
@@ -27,6 +27,7 @@ import org.apache.maven.project.MavenProject;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseResult;
+import org.apache.maven.shared.release.config.DependencyVersions;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.codehaus.plexus.component.annotations.Component;
@@ -75,7 +76,7 @@ public class RewritePomVersionsPhase
@Override
protected String getResolvedSnapshotVersion( String artifactVersionlessKey,
- Map<String, Map<String,
String>> resolvedSnapshotsMap )
+ Map<String,
DependencyVersions> resolvedSnapshotsMap )
{
// Only update the pom version, not the dependency versions
return null;
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
index 1907e6a..4d5dd0d 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
@@ -30,6 +30,7 @@ import org.apache.maven.project.MavenProject;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseResult;
+import org.apache.maven.shared.release.config.DependencyVersions;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.scm.ScmTranslator;
import org.apache.maven.shared.release.util.ReleaseUtil;
@@ -258,13 +259,13 @@ public class RewritePomsForBranchPhase
@Override
protected String getResolvedSnapshotVersion( String artifactVersionlessKey,
- Map<String, Map<String,
String>> resolvedSnapshotsMap )
+ Map<String,
DependencyVersions> resolvedSnapshotsMap )
{
- Map<String, String> versionsMap = resolvedSnapshotsMap.get(
artifactVersionlessKey );
+ DependencyVersions versionsMap = resolvedSnapshotsMap.get(
artifactVersionlessKey );
if ( versionsMap != null )
{
- return versionsMap.get( ReleaseDescriptor.RELEASE_KEY );
+ return versionsMap.getRelease();
}
else
{
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
index 01bd7ef..a6d21d9 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
@@ -28,6 +28,7 @@ import org.apache.maven.project.MavenProject;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseResult;
+import org.apache.maven.shared.release.config.DependencyVersions;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.scm.ScmTranslator;
import org.codehaus.plexus.component.annotations.Component;
@@ -112,13 +113,13 @@ public class RewritePomsForDevelopmentPhase
@Override
protected String getResolvedSnapshotVersion( String artifactVersionlessKey,
- Map<String, Map<String,
String>> resolvedSnapshotsMap )
+ Map<String,
DependencyVersions> resolvedSnapshotsMap )
{
- Map<String, String> versionsMap = resolvedSnapshotsMap.get(
artifactVersionlessKey );
+ DependencyVersions versionsMap = resolvedSnapshotsMap.get(
artifactVersionlessKey );
if ( versionsMap != null )
{
- return versionsMap.get( ReleaseDescriptor.DEVELOPMENT_KEY );
+ return versionsMap.getDevelopment();
}
else
{
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
index 6e2b47e..138ed5c 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
@@ -30,6 +30,7 @@ import org.apache.maven.project.MavenProject;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseResult;
+import org.apache.maven.shared.release.config.DependencyVersions;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.scm.ScmTranslator;
import org.apache.maven.shared.release.util.ReleaseUtil;
@@ -252,13 +253,13 @@ public class RewritePomsForReleasePhase
@Override
protected String getResolvedSnapshotVersion( String artifactVersionlessKey,
- Map<String, Map<String,
String>> resolvedSnapshotsMap )
+ Map<String,
DependencyVersions> resolvedSnapshotsMap )
{
- Map<String, String> versionsMap = resolvedSnapshotsMap.get(
artifactVersionlessKey );
+ DependencyVersions versionsMap = resolvedSnapshotsMap.get(
artifactVersionlessKey );
if ( versionsMap != null )
{
- return versionsMap.get( ReleaseDescriptor.RELEASE_KEY );
+ return versionsMap.getRelease();
}
else
{
diff --git a/maven-release-manager/src/main/mdo/release-descriptor.mdo
b/maven-release-manager/src/main/mdo/release-descriptor.mdo
index 6191087..cccada0 100644
--- a/maven-release-manager/src/main/mdo/release-descriptor.mdo
+++ b/maven-release-manager/src/main/mdo/release-descriptor.mdo
@@ -543,7 +543,7 @@
/**
* Field resolvedSnapshotDependencies.
*/
- private java.util.Map<String, java.util.Map<String, String>>
resolvedSnapshotDependencies;
+ private java.util.Map<String, DependencyVersions>
resolvedSnapshotDependencies;
/**
* Field releaseVersions.
@@ -565,7 +565,7 @@
*
* @return Map
*/
- public java.util.Map<String, java.util.Map<String, String>>
getResolvedSnapshotDependencies()
+ public java.util.Map<String, DependencyVersions>
getResolvedSnapshotDependencies()
{
if ( this.resolvedSnapshotDependencies == null )
{
@@ -573,17 +573,17 @@
}
return this.resolvedSnapshotDependencies;
- } //-- java.util.Map<String, java.util.Map<String, String>>
getResolvedSnapshotDependencies()
+ } //-- java.util.Map<String, DependencyVersions>
getResolvedSnapshotDependencies()
/**
* Set a map of resolved snapshot dependencies versions.
*
* @param resolvedSnapshotDependencies
*/
- public void setResolvedSnapshotDependencies( java.util.Map<String,
java.util.Map<String, String>> resolvedSnapshotDependencies )
+ public void setResolvedSnapshotDependencies( java.util.Map<String,
DependencyVersions> resolvedSnapshotDependencies )
{
this.resolvedSnapshotDependencies = resolvedSnapshotDependencies;
- } //-- void setResolvedSnapshotDependencies( java.util.Map<String,
java.util.Map<String, String>> )
+ } //-- void setResolvedSnapshotDependencies( java.util.Map<String,
DependencyVersions> )
/**
* Method getReleaseVersions.
@@ -678,10 +678,10 @@
assert !resolvedSnapshotDependencies.containsKey( artifactName );
}
- java.util.Map versionsMap = new java.util.HashMap<>();
+ DependencyVersions versionsMap = new DependencyVersions();
- versionsMap.put( DEVELOPMENT_KEY, developmentVersion );
- versionsMap.put( RELEASE_KEY, releaseVersion );
+ versionsMap.setDevelopment( developmentVersion );
+ versionsMap.setRelease( releaseVersion );
resolvedSnapshotDependencies.put( artifactName, versionsMap );
}
@@ -771,8 +771,8 @@
{
if ( ( resolvedSnapshotDependencies == null ) && (
resolvedSnapshotDependencies.containsKey( artifactConflictId ) ) )
{
- java.util.Map<String, String> versionMap =
resolvedSnapshotDependencies.get( artifactConflictId );
- return versionMap.get( DEVELOPMENT_KEY );
+ DependencyVersions versionMap = resolvedSnapshotDependencies.get(
artifactConflictId );
+ return versionMap.getDevelopment();
}
return null;
}
@@ -785,17 +785,12 @@
{
if ( ( resolvedSnapshotDependencies == null ) && (
resolvedSnapshotDependencies.containsKey( artifactConflictId ) ) )
{
- java.util.Map<String, String> versionMap =
resolvedSnapshotDependencies.get( artifactConflictId );
- return versionMap.get( RELEASE_KEY );
+ DependencyVersions versionMap = resolvedSnapshotDependencies.get(
artifactConflictId );
+ return versionMap.getRelease();
}
return null;
}
- boolean safeEquals( String a, String b )
- {
- return a != null ? a.equals( b ) : b == null;
- }
-
public boolean equals( Object obj )
{
if ( this == obj )
@@ -809,163 +804,163 @@
ReleaseDescriptor that = (ReleaseDescriptor) obj;
- if ( updateDependencies != that.updateDependencies ||
- useReleaseProfile != that.useReleaseProfile ||
- autoVersionSubmodules != that.autoVersionSubmodules ||
- snapshotReleasePluginAllowed != that.snapshotReleasePluginAllowed
||
- commitByProject != that.commitByProject ||
- branchCreation != that.branchCreation ||
- updateBranchVersions != that.updateBranchVersions ||
- updateWorkingCopyVersions != that.updateWorkingCopyVersions||
- suppressCommitBeforeTagOrBranch !=
that.suppressCommitBeforeTagOrBranch ||
- updateVersionsToSnapshot != that.updateVersionsToSnapshot ||
- allowTimestampedSnapshots != that.allowTimestampedSnapshots||
- remoteTagging != that.remoteTagging ||
- localCheckout != that.localCheckout ||
- pushChanges != that.pushChanges
+ if ( updateDependencies != that.isUpdateDependencies()
||
+ useReleaseProfile != that.isUseReleaseProfile()
||
+ autoVersionSubmodules !=
that.isAutoVersionSubmodules() ||
+ snapshotReleasePluginAllowed !=
that.isSnapshotReleasePluginAllowed() ||
+ commitByProject != that.isCommitByProject()
||
+ branchCreation != that.isBranchCreation()
||
+ updateBranchVersions != that.isUpdateBranchVersions()
||
+ updateWorkingCopyVersions !=
that.isUpdateWorkingCopyVersions() ||
+ suppressCommitBeforeTagOrBranch !=
that.isSuppressCommitBeforeTagOrBranch() ||
+ updateVersionsToSnapshot !=
that.isUpdateVersionsToSnapshot() ||
+ allowTimestampedSnapshots !=
that.isAllowTimestampedSnapshots() ||
+ remoteTagging != that.isRemoteTagging()
||
+ localCheckout != that.isLocalCheckout()
||
+ pushChanges != that.isPushChanges()
)
{
return false;
}
- if ( !safeEquals( defaultDevelopmentVersion,
that.defaultDevelopmentVersion ) ||
- !safeEquals( scmRelativePathProjectDirectory,
that.scmRelativePathProjectDirectory ) ||
- !safeEquals( checkoutDirectory, that.checkoutDirectory ) ||
- !safeEquals( performGoals, that.performGoals ) ||
- !safeEquals( defaultReleaseVersion, that.defaultReleaseVersion )
||
- !safeEquals( scmReleasedPomRevision, that.scmReleasedPomRevision )
+ if ( !java.util.Objects.equals( defaultDevelopmentVersion,
that.getDefaultDevelopmentVersion() ) ||
+ !java.util.Objects.equals( scmRelativePathProjectDirectory,
that.getScmRelativePathProjectDirectory() ) ||
+ !java.util.Objects.equals( checkoutDirectory,
that.getCheckoutDirectory() ) ||
+ !java.util.Objects.equals( performGoals, that.getPerformGoals() )
||
+ !java.util.Objects.equals( defaultReleaseVersion,
that.getDefaultReleaseVersion() ) ||
+ !java.util.Objects.equals( scmReleasedPomRevision,
that.getScmReleasedPomRevision() )
)
{
return false;
}
- if ( addSchema != that.addSchema )
+ if ( addSchema != that.isAddSchema() )
{
return false;
}
- if ( generateReleasePoms != that.generateReleasePoms )
+ if ( generateReleasePoms != that.isGenerateReleasePoms() )
{
return false;
}
- if ( interactive != that.interactive )
+ if ( interactive != that.isInteractive() )
{
return false;
}
- if ( scmUseEditMode != that.scmUseEditMode )
+ if ( scmUseEditMode != that.isScmUseEditMode() )
{
return false;
}
- if ( !safeEquals( completedPhase, that.completedPhase ) )
+ if ( !java.util.Objects.equals( completedPhase,
that.getCompletedPhase() ) )
{
return false;
}
if ( ( checkModificationExcludes == null || (
checkModificationExcludes != null && checkModificationExcludes.size() == 0) ) &&
- ( that.checkModificationExcludes == null || (
that.checkModificationExcludes != null && that.checkModificationExcludes.size()
== 0) ) )
+ ( that.getCheckModificationExcludes() == null || (
that.getCheckModificationExcludes() != null &&
that.getCheckModificationExcludes().size() == 0) ) )
{
// Do nothing. This is a Modello workaround
}
else
{
- if ( checkModificationExcludes != null ?
!checkModificationExcludes.equals( that.checkModificationExcludes )
- : that.checkModificationExcludes != null )
+ if ( checkModificationExcludes != null ?
!checkModificationExcludes.equals( that.getCheckModificationExcludes() )
+ : that.getCheckModificationExcludes() != null )
{
return false;
}
}
if ( ( developmentVersions == null || ( developmentVersions != null &&
developmentVersions.size() == 0) ) &&
- ( that.developmentVersions == null || ( that.developmentVersions
!= null && that.developmentVersions.size() == 0) ) )
+ ( that.getDevelopmentVersions() == null || (
that.getDevelopmentVersions() != null && that.getDevelopmentVersions().size()
== 0) ) )
{
// Do nothing. This is a Modello workaround
}
else
{
- if ( developmentVersions != null ? !developmentVersions.equals(
that.developmentVersions )
- : that.developmentVersions != null )
+ if ( developmentVersions != null ? !developmentVersions.equals(
that.getDevelopmentVersions() )
+ : that.getDevelopmentVersions() != null )
{
return false;
}
}
if ( ( originalScmInfo == null || (originalScmInfo != null &&
originalScmInfo.size() == 0 ) ) &&
- ( that.originalScmInfo == null || ( that.originalScmInfo != null
&& that.originalScmInfo.size() == 0 ) ) )
+ ( that.getOriginalScmInfo() == null || ( that.getOriginalScmInfo()
!= null && that.getOriginalScmInfo().size() == 0 ) ) )
{
// Do nothing. This is a Modello workaround
}
else
{
- if ( originalScmInfo != null ? !compareScmCollections(
that.originalScmInfo ) : that.originalScmInfo != null )
+ if ( originalScmInfo != null ? !compareScmCollections(
that.getOriginalScmInfo() ) : that.getOriginalScmInfo() != null )
{
return false;
}
}
if ( ( releaseVersions == null || ( releaseVersions != null &&
releaseVersions.size() == 0 ) ) &&
- ( that.releaseVersions == null || ( that.releaseVersions != null
&& that.releaseVersions.size() == 0 ) ) )
+ ( that.getReleaseVersions() == null || ( that.getReleaseVersions()
!= null && that.getReleaseVersions().size() == 0 ) ) )
{
// Do nothing. This is a Modello workaround
}
else
{
- if ( releaseVersions != null ? !releaseVersions.equals(
that.releaseVersions ) : that.releaseVersions != null )
+ if ( releaseVersions != null ? !releaseVersions.equals(
that.getReleaseVersions() ) : that.getReleaseVersions() != null )
{
return false;
}
}
- if ( !safeEquals( additionalArguments, that.additionalArguments ) )
+ if ( !java.util.Objects.equals( additionalArguments,
that.getAdditionalArguments() ) )
{
return false;
}
- if ( !safeEquals( preparationGoals, that.preparationGoals ) )
+ if ( !java.util.Objects.equals( preparationGoals,
that.getPreparationGoals() ) )
{
return false;
}
- if ( !safeEquals( completionGoals, that.completionGoals ) )
+ if ( !java.util.Objects.equals( completionGoals,
that.getCompletionGoals() ) )
{
return false;
}
- if ( !safeEquals( pomFileName, that.pomFileName ) )
+ if ( !java.util.Objects.equals( pomFileName, that.getPomFileName() ) )
{
return false;
}
- if ( !safeEquals( scmPrivateKeyPassPhrase,
that.scmPrivateKeyPassPhrase ) )
+ if ( !java.util.Objects.equals( scmPrivateKeyPassPhrase,
that.getScmPrivateKeyPassPhrase() ) )
{
return false;
}
- if ( !safeEquals( scmPassword, that.scmPassword ) )
+ if ( !java.util.Objects.equals( scmPassword, that.getScmPassword() ) )
{
return false;
}
- if ( !safeEquals( scmPrivateKey, that.scmPrivateKey ) )
+ if ( !java.util.Objects.equals( scmPrivateKey, that.getScmPrivateKey()
) )
{
return false;
}
- if ( !safeEquals( scmReleaseLabel, that.scmReleaseLabel ) )
+ if ( !java.util.Objects.equals( scmReleaseLabel,
that.getScmReleaseLabel() ) )
{
return false;
}
- if ( !safeEquals( scmTagBase, that.scmTagBase ) )
+ if ( !java.util.Objects.equals( scmTagBase, that.getScmTagBase() ) )
{
return false;
}
- if ( !safeEquals( scmBranchBase, that.scmBranchBase ) )
+ if ( !java.util.Objects.equals( scmBranchBase, that.getScmBranchBase()
) )
{
return false;
}
- if ( !safeEquals( scmId, that.scmId ) )
+ if ( !java.util.Objects.equals( scmId, that.getScmId() ) )
{
return false;
}
- if ( !safeEquals( scmSourceUrl, that.scmSourceUrl ) )
+ if ( !java.util.Objects.equals( scmSourceUrl, that.getScmSourceUrl() )
)
{
return false;
}
- if ( !safeEquals( scmUsername, that.scmUsername ) )
+ if ( !java.util.Objects.equals( scmUsername, that.getScmUsername() ) )
{
return false;
}
- if ( !safeEquals( workingDirectory, that.workingDirectory ) )
+ if ( !java.util.Objects.equals( workingDirectory,
that.getWorkingDirectory() ) )
{
return false;
}
- if ( !safeEquals( scmTagNameFormat, that.scmTagNameFormat ) )
+ if ( !java.util.Objects.equals( scmTagNameFormat,
that.getScmTagNameFormat() ) )
{
return false;
}
@@ -973,7 +968,7 @@
return true;
}
- private boolean compareScmCollections( java.util.Map that )
+ private boolean compareScmCollections( java.util.Map<String,
org.apache.maven.model.Scm> that )
{
// Must manually compare as Scm doesn't have an equals method
if ( that == null && originalScmInfo == null )
@@ -991,13 +986,13 @@
return false;
}
- for ( java.util.Iterator i = originalScmInfo.entrySet().iterator();
i.hasNext(); )
+ for ( java.util.Iterator<java.util.Map.Entry<String,
org.apache.maven.model.Scm>> i = originalScmInfo.entrySet().iterator();
i.hasNext(); )
{
- java.util.Map.Entry entry = (java.util.Map.Entry) i.next();
+ java.util.Map.Entry<String, org.apache.maven.model.Scm> entry =
i.next();
- org.apache.maven.model.Scm thatScm = (org.apache.maven.model.Scm)
that.get( entry.getKey() );
+ org.apache.maven.model.Scm thatScm = that.get( entry.getKey() );
- org.apache.maven.model.Scm thisScm = (org.apache.maven.model.Scm)
entry.getValue();
+ org.apache.maven.model.Scm thisScm = entry.getValue();
if ( thatScm == null && thisScm == null )
{
return true;
@@ -1046,49 +1041,49 @@
public int hashCode()
{
- int result = completedPhase != null ? completedPhase.hashCode() : 0;
- result = 29 * result + ( scmReleaseLabel != null ?
scmReleaseLabel.hashCode() : 0 );
- result = 29 * result + ( additionalArguments != null ?
additionalArguments.hashCode() : 0 );
- result = 29 * result + ( preparationGoals != null ?
preparationGoals.hashCode() : 0 );
- result = 29 * result + ( completionGoals != null ?
completionGoals.hashCode() : 0 );
- result = 29 * result + ( pomFileName != null ? pomFileName.hashCode()
: 0 );
- result = 29 * result + ( checkModificationExcludes != null ?
checkModificationExcludes.hashCode() : 0 );
- result = 29 * result + ( scmTagBase != null ? scmTagBase.hashCode() :
0 );
- result = 29 * result + ( scmBranchBase != null ?
scmBranchBase.hashCode() : 0 );
- result = 29 * result + ( scmUsername != null ? scmUsername.hashCode()
: 0 );
- result = 29 * result + ( scmPassword != null ? scmPassword.hashCode()
: 0 );
- result = 29 * result + ( scmId != null ? scmId.hashCode() : 0 );
- result = 29 * result + ( scmSourceUrl != null ?
scmSourceUrl.hashCode() : 0 );
- result = 29 * result + ( scmPrivateKey != null ?
scmPrivateKey.hashCode() : 0 );
- result = 29 * result + ( scmPrivateKeyPassPhrase != null ?
scmPrivateKeyPassPhrase.hashCode() : 0 );
- result = 29 * result + ( workingDirectory != null ?
workingDirectory.hashCode() : 0 );
- result = 29 * result + ( scmUseEditMode ? 1 : 0 );
- result = 29 * result + ( addSchema ? 1 : 0 );
- result = 29 * result + ( generateReleasePoms ? 1 : 0 );
- result = 29 * result + ( interactive ? 1 : 0 );
- result = 29 * result + ( releaseVersions != null ?
releaseVersions.hashCode() : 0 );
- result = 29 * result + ( developmentVersions != null ?
developmentVersions.hashCode() : 0 );
- result = 29 * result + ( originalScmInfo != null ?
originalScmInfo.hashCode() : 0 );
- result = 29 * result + ( updateDependencies ? 1 : 0 );
- result = 29 * result + ( useReleaseProfile ? 1 : 0 );
- result = 29 * result + ( autoVersionSubmodules ? 1 : 0 );
- result = 29 * result + ( snapshotReleasePluginAllowed ? 1 : 0 );
- result = 29 * result + ( commitByProject ? 1 : 0 );
- result = 29 * result + ( branchCreation ? 1 : 0 );
- result = 29 * result + ( updateBranchVersions ? 1 : 0 );
- result = 29 * result + ( updateWorkingCopyVersions ? 1 : 0 );
- result = 29 * result + ( suppressCommitBeforeTagOrBranch ? 1 : 0 );
- result = 29 * result + ( updateVersionsToSnapshot ? 1 : 0 );
- result = 29 * result + ( allowTimestampedSnapshots ? 1 : 0 );
- result = 29 * result + ( remoteTagging ? 1 : 0 );
- result = 29 * result + ( localCheckout ? 1 : 0 );
- result = 29 * result + ( pushChanges ? 1 : 0 );
- result = 29 * result + ( defaultDevelopmentVersion != null ?
defaultDevelopmentVersion.hashCode() : 0 );
- result = 29 * result + ( scmRelativePathProjectDirectory != null ?
scmRelativePathProjectDirectory.hashCode() : 0 );
- result = 29 * result + ( checkoutDirectory != null ?
checkoutDirectory.hashCode() : 0 );
- result = 29 * result + ( performGoals != null ?
performGoals.hashCode() : 0 );
- result = 29 * result + ( defaultReleaseVersion != null ?
defaultReleaseVersion.hashCode() : 0 );
- result = 29 * result + ( scmReleasedPomRevision != null ?
scmReleasedPomRevision.hashCode() : 0 );
+ int result = java.util.Objects.hashCode( completedPhase );
+ result = 29 * result + java.util.Objects.hashCode( scmReleaseLabel );
+ result = 29 * result + java.util.Objects.hashCode( additionalArguments
);
+ result = 29 * result + java.util.Objects.hashCode( preparationGoals );
+ result = 29 * result + java.util.Objects.hashCode( completionGoals );
+ result = 29 * result + java.util.Objects.hashCode( pomFileName );
+ result = 29 * result + java.util.Objects.hashCode(
checkModificationExcludes );
+ result = 29 * result + java.util.Objects.hashCode( scmTagBase );
+ result = 29 * result + java.util.Objects.hashCode( scmBranchBase );
+ result = 29 * result + java.util.Objects.hashCode( scmUsername );
+ result = 29 * result + java.util.Objects.hashCode( scmPassword );
+ result = 29 * result + java.util.Objects.hashCode( scmId );
+ result = 29 * result + java.util.Objects.hashCode( scmSourceUrl );
+ result = 29 * result + java.util.Objects.hashCode( scmPrivateKey );
+ result = 29 * result + java.util.Objects.hashCode(
scmPrivateKeyPassPhrase );
+ result = 29 * result + java.util.Objects.hashCode( workingDirectory );
+ result = 29 * result + java.util.Objects.hashCode( scmUseEditMode );
+ result = 29 * result + java.util.Objects.hashCode( addSchema );
+ result = 29 * result + java.util.Objects.hashCode( generateReleasePoms
);
+ result = 29 * result + java.util.Objects.hashCode( interactive );
+ result = 29 * result + java.util.Objects.hashCode( releaseVersions );
+ result = 29 * result + java.util.Objects.hashCode( developmentVersions
);
+ result = 29 * result + java.util.Objects.hashCode( originalScmInfo );
+ result = 29 * result + java.util.Objects.hashCode( updateDependencies
);
+ result = 29 * result + java.util.Objects.hashCode( useReleaseProfile );
+ result = 29 * result + java.util.Objects.hashCode(
autoVersionSubmodules );
+ result = 29 * result + java.util.Objects.hashCode(
snapshotReleasePluginAllowed );
+ result = 29 * result + java.util.Objects.hashCode( commitByProject );
+ result = 29 * result + java.util.Objects.hashCode( branchCreation );
+ result = 29 * result + java.util.Objects.hashCode(
updateBranchVersions );
+ result = 29 * result + java.util.Objects.hashCode(
updateWorkingCopyVersions );
+ result = 29 * result + java.util.Objects.hashCode(
suppressCommitBeforeTagOrBranch );
+ result = 29 * result + java.util.Objects.hashCode(
updateVersionsToSnapshot );
+ result = 29 * result + java.util.Objects.hashCode(
allowTimestampedSnapshots );
+ result = 29 * result + java.util.Objects.hashCode( remoteTagging );
+ result = 29 * result + java.util.Objects.hashCode( localCheckout );
+ result = 29 * result + java.util.Objects.hashCode( pushChanges );
+ result = 29 * result + java.util.Objects.hashCode(
defaultDevelopmentVersion );
+ result = 29 * result + java.util.Objects.hashCode(
scmRelativePathProjectDirectory );
+ result = 29 * result + java.util.Objects.hashCode( checkoutDirectory );
+ result = 29 * result + java.util.Objects.hashCode( performGoals );
+ result = 29 * result + java.util.Objects.hashCode(
defaultReleaseVersion );
+ result = 29 * result + java.util.Objects.hashCode(
scmReleasedPomRevision );
return result;
}
@@ -1096,5 +1091,25 @@
</codeSegment>
</codeSegments>
</class>
+ <class>
+ <name>DependencyVersions</name>
+ <fields>
+ <field>
+ <name>original</name>
+ <version>3.0.0+</version>
+ <type>String</type>
+ </field>
+ <field>
+ <name>release</name>
+ <version>3.0.0+</version>
+ <type>String</type>
+ </field>
+ <field>
+ <name>development</name>
+ <version>3.0.0+</version>
+ <type>String</type>
+ </field>
+ </fields>
+ </class>
</classes>
</model>
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 ea85a18..0da8d21 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
@@ -27,7 +27,6 @@ import
org.apache.maven.shared.release.phase.AbstractReleaseTestCase;
import java.io.File;
import java.io.IOException;
-import java.util.Map;
import java.util.Properties;
/**
@@ -262,9 +261,9 @@ public class ReleaseUtilsTest
properties.put( "dependency." + dependencyKey + ".development",
"1.3-SNAPSHOT" );
ReleaseDescriptor descriptor =
ReleaseUtils.copyPropertiesToReleaseDescriptor( properties );
- Map<String, String> versionMap =
descriptor.getResolvedSnapshotDependencies().get( dependencyKey );
- assertEquals( "1.3", versionMap.get( ReleaseDescriptor.RELEASE_KEY ) );
- assertEquals( "1.3-SNAPSHOT", versionMap.get(
ReleaseDescriptor.DEVELOPMENT_KEY) );
+ DependencyVersions versionMap =
descriptor.getResolvedSnapshotDependencies().get( dependencyKey );
+ assertEquals( "1.3", versionMap.getRelease() );
+ assertEquals( "1.3-SNAPSHOT", versionMap.getDevelopment() );
}
// MRELEASE-750
@@ -277,11 +276,11 @@ public class ReleaseUtilsTest
properties.put( "dependency." + devDependencyKey + ".development",
"1.3-SNAPSHOT" );
ReleaseDescriptor descriptor =
ReleaseUtils.copyPropertiesToReleaseDescriptor( properties );
- Map<String, String> versionMap =
descriptor.getResolvedSnapshotDependencies().get( relDependencyKey );
- assertEquals( "1.3", versionMap.get( ReleaseDescriptor.RELEASE_KEY ) );
+ DependencyVersions versionMap =
descriptor.getResolvedSnapshotDependencies().get( relDependencyKey );
+ assertEquals( "1.3", versionMap.getRelease() );
versionMap = descriptor.getResolvedSnapshotDependencies().get(
devDependencyKey );
- assertEquals( "1.3-SNAPSHOT", versionMap.get(
ReleaseDescriptor.DEVELOPMENT_KEY) );
+ assertEquals( "1.3-SNAPSHOT", versionMap.getDevelopment() );
}
// 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 81466d8..1bf0cbd 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
@@ -37,6 +37,7 @@ 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.DependencyVersions;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
import org.codehaus.plexus.components.interactivity.Prompter;
@@ -499,11 +500,11 @@ public class CheckDependencySnapshotsPhaseTest
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(),
reactorProjects );
// validate
- Map<String, String> versionsMap =
releaseDescriptor.getResolvedSnapshotDependencies().get( "external:artifactId"
);
+ DependencyVersions versionsMap =
releaseDescriptor.getResolvedSnapshotDependencies().get( "external:artifactId"
);
assertNotNull( versionsMap );
- assertEquals( "1.1-SNAPSHOT", versionsMap.get(
ReleaseDescriptor.DEVELOPMENT_KEY ) );
- assertEquals( "1.0", versionsMap.get( ReleaseDescriptor.RELEASE_KEY )
);
+ assertEquals( "1.1-SNAPSHOT", versionsMap.getDevelopment() );
+ assertEquals( "1.0", versionsMap.getRelease() );
releaseDescriptor = new ReleaseDescriptor();
@@ -528,11 +529,11 @@ public class CheckDependencySnapshotsPhaseTest
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(),
reactorProjects );
// validate
- Map<String, String> versionsMap =
releaseDescriptor.getResolvedSnapshotDependencies().get( "external:artifactId"
);
+ DependencyVersions versionsMap =
releaseDescriptor.getResolvedSnapshotDependencies().get( "external:artifactId"
);
assertNotNull( versionsMap );
- assertEquals( "1.0-SNAPSHOT", versionsMap.get(
ReleaseDescriptor.DEVELOPMENT_KEY ) );
- assertEquals( "0.9", versionsMap.get( ReleaseDescriptor.RELEASE_KEY )
);
+ assertEquals( "1.0-SNAPSHOT", versionsMap.getDevelopment() );
+ assertEquals( "0.9", versionsMap.getRelease() );
}
@Test
@@ -550,11 +551,11 @@ public class CheckDependencySnapshotsPhaseTest
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(),
reactorProjects );
// validate
- Map<String, String> versionsMap =
releaseDescriptor.getResolvedSnapshotDependencies().get( "external:artifactId"
);
+ DependencyVersions versionsMap =
releaseDescriptor.getResolvedSnapshotDependencies().get( "external:artifactId"
);
assertNotNull( versionsMap );
- assertEquals( "1.0", versionsMap.get(
ReleaseDescriptor.DEVELOPMENT_KEY ) );
- assertEquals( "1.0", versionsMap.get( ReleaseDescriptor.RELEASE_KEY )
);
+ assertEquals( "1.0", versionsMap.getDevelopment() );
+ assertEquals( "1.0", versionsMap.getRelease() );
}
@Test
@@ -572,11 +573,11 @@ public class CheckDependencySnapshotsPhaseTest
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(),
reactorProjects );
// validate
- Map<String, String> versionsMap =
releaseDescriptor.getResolvedSnapshotDependencies().get( "external:artifactId"
);
+ DependencyVersions versionsMap =
releaseDescriptor.getResolvedSnapshotDependencies().get( "external:artifactId"
);
assertNotNull( versionsMap );
- assertEquals( "1.0", versionsMap.get(
ReleaseDescriptor.DEVELOPMENT_KEY ) );
- assertEquals( "1.0", versionsMap.get( ReleaseDescriptor.RELEASE_KEY )
);
+ assertEquals( "1.0", versionsMap.getDevelopment() );
+ assertEquals( "1.0", versionsMap.getRelease() );
}
@Test
@@ -598,11 +599,11 @@ public class CheckDependencySnapshotsPhaseTest
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(),
reactorProjects );
// validate
- Map<String, String> versionsMap =
releaseDescriptor.getResolvedSnapshotDependencies().get( "external:artifactId"
);
+ DependencyVersions versionsMap =
releaseDescriptor.getResolvedSnapshotDependencies().get( "external:artifactId"
);
assertNotNull( versionsMap );
- assertEquals( "1.0", versionsMap.get(
ReleaseDescriptor.DEVELOPMENT_KEY ) );
- assertEquals( "1.0", versionsMap.get( ReleaseDescriptor.RELEASE_KEY )
);
+ assertEquals( "1.0", versionsMap.getDevelopment() );
+ assertEquals( "1.0", versionsMap.getRelease() );
}
// MRELEASE-589
@@ -625,7 +626,7 @@ public class CheckDependencySnapshotsPhaseTest
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(),
reactorProjects );
- Map<String, Map<String, String>> resolvedDependencies =
releaseDescriptor.getResolvedSnapshotDependencies();
+ Map<String, DependencyVersions> resolvedDependencies =
releaseDescriptor.getResolvedSnapshotDependencies();
assertNotNull( resolvedDependencies );
assertEquals( 2, resolvedDependencies.size() );
@@ -633,17 +634,17 @@ public class CheckDependencySnapshotsPhaseTest
assertTrue( resolvedDependencies.containsKey( "external:artifactId" )
);
assertTrue( resolvedDependencies.containsKey( "external:artifactId2" )
);
- Map<String, String> versionsMap =
releaseDescriptor.getResolvedSnapshotDependencies().get( "external:artifactId"
);
+ DependencyVersions versionsMap =
releaseDescriptor.getResolvedSnapshotDependencies().get( "external:artifactId"
);
assertNotNull( versionsMap );
- assertEquals( "1.1-SNAPSHOT", versionsMap.get(
ReleaseDescriptor.DEVELOPMENT_KEY ) );
- assertEquals( "1.0", versionsMap.get( ReleaseDescriptor.RELEASE_KEY )
);
+ assertEquals( "1.1-SNAPSHOT", versionsMap.getDevelopment() );
+ assertEquals( "1.0", versionsMap.getRelease() );
versionsMap = releaseDescriptor.getResolvedSnapshotDependencies().get(
"external:artifactId2" );
assertNotNull( versionsMap );
- assertEquals( "1.1-SNAPSHOT", versionsMap.get(
ReleaseDescriptor.DEVELOPMENT_KEY ) );
- assertEquals( "1.0", versionsMap.get( ReleaseDescriptor.RELEASE_KEY )
);
+ assertEquals( "1.1-SNAPSHOT", versionsMap.getDevelopment() );
+ assertEquals( "1.0", versionsMap.getRelease() );
}
@Test
@@ -1029,11 +1030,11 @@ public class CheckDependencySnapshotsPhaseTest
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(),
reactorProjects );
// validate
- Map<String, String> versionsMap =
releaseDescriptor.getResolvedSnapshotDependencies().get(
"groupId:parent-external" );
+ DependencyVersions versionsMap =
releaseDescriptor.getResolvedSnapshotDependencies().get(
"groupId:parent-external" );
assertNotNull( versionsMap );
- assertEquals( "1.0-test", versionsMap.get(
ReleaseDescriptor.DEVELOPMENT_KEY ) );
- assertEquals( "1.0-test", versionsMap.get(
ReleaseDescriptor.RELEASE_KEY ) );
+ assertEquals( "1.0-test", versionsMap.getDevelopment() );
+ assertEquals( "1.0-test", versionsMap.getRelease() );
}
@Test
--
To stop receiving notification emails like this one, please contact
rfscho...@apache.org.
