Spring/spring-data-dev-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix version number comparison.

Browse Source 
Consider modifier.

See #159
This commit is contained in:
Mark Paluch
2021-01-13 15:56:59 +01:00
parent a8e3b291db
commit 1d74c136e5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
release-tools/src/main/java/org/springframework/data/release/model/ArtifactVersion.java
View File

@@ -23,6 +23,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
/** /**
* Value object to represent version of a particular artifact. * Value object to represent version of a particular artifact.
@@ -328,12 +329,13 @@ public class ArtifactVersion implements Comparable<ArtifactVersion> {
ArtifactVersion other = (ArtifactVersion) o; ArtifactVersion other = (ArtifactVersion) o;
return version.equals(other.version) && isReleaseVersion() == other.isReleaseVersion() return version.equals(other.version) && isReleaseVersion() == other.isReleaseVersion()
&& isSnapshotVersion() == other.isSnapshotVersion() && isMilestoneVersion() == other.isMilestoneVersion() && isSnapshotVersion() == other.isSnapshotVersion() && isMilestoneVersion() == other.isMilestoneVersion()
&& isReleaseCandidateVersion() == other.isReleaseCandidateVersion(); && isReleaseCandidateVersion() == other.isReleaseCandidateVersion()
&& ObjectUtils.nullSafeEquals(suffix, other.suffix);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(version, isReleaseVersion(), isSnapshotVersion(), isMilestoneVersion(), return Objects.hash(version, isReleaseVersion(), isSnapshotVersion(), isMilestoneVersion(),
isReleaseCandidateVersion()); isReleaseCandidateVersion(), suffix);
} }
} }