root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Fix comparision of identical snapshots 

Closes gh-35860
This commit is contained in:
Andy Wilkinson 2023-06-13 11:49:32 +01:00
parent 1955139b72
commit 50a5e31873
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/version/ArtifactVersionDependencyVersion.java
View File

@ -16,6 +16,7 @@
package org.springframework.boot.build.bom.bomr.version; package org.springframework.boot.build.bom.bomr.version;
import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.ArtifactVersion;
@ -79,7 +80,8 @@ class ArtifactVersionDependencyVersion extends AbstractDependencyVersion {
public int compareTo(DependencyVersion other) { public int compareTo(DependencyVersion other) {
if (other instanceof ArtifactVersionDependencyVersion otherArtifactDependencyVersion) { if (other instanceof ArtifactVersionDependencyVersion otherArtifactDependencyVersion) {
ArtifactVersion otherArtifactVersion = otherArtifactDependencyVersion.artifactVersion; ArtifactVersion otherArtifactVersion = otherArtifactDependencyVersion.artifactVersion;
if ("snapshot".equalsIgnoreCase(otherArtifactVersion.getQualifier()) if ((!Objects.equals(this.artifactVersion.getQualifier(), otherArtifactVersion.getQualifier()))
&& "snapshot".equalsIgnoreCase(otherArtifactVersion.getQualifier())
&& otherArtifactVersion.getMajorVersion() == this.artifactVersion.getMajorVersion() && otherArtifactVersion.getMajorVersion() == this.artifactVersion.getMajorVersion()
&& otherArtifactVersion.getMinorVersion() == this.artifactVersion.getMinorVersion() && otherArtifactVersion.getMinorVersion() == this.artifactVersion.getMinorVersion()
&& otherArtifactVersion.getIncrementalVersion() == this.artifactVersion.getIncrementalVersion()) { && otherArtifactVersion.getIncrementalVersion() == this.artifactVersion.getIncrementalVersion()) {

5
buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/version/ArtifactVersionDependencyVersionTests.java
View File

@ -97,6 +97,11 @@ class ArtifactVersionDependencyVersionTests {
assertThat(version("2.1.2").isSameMinorAndNewerThan(version("2.1.2"))).isFalse(); assertThat(version("2.1.2").isSameMinorAndNewerThan(version("2.1.2"))).isFalse();
} }
@Test
void isSameMinorAndNewerThanWhenSameSnapshotsShouldReturnFalse() {
assertThat(version("3.1.2-SNAPSHOT").isSameMinorAndNewerThan(version("3.1.2-SNAPSHOT"))).isFalse();
}
@Test @Test
void isSameMinorAndNewerThanWhenPatchIsNewerShouldReturnFalse() { void isSameMinorAndNewerThanWhenPatchIsNewerShouldReturnFalse() {
assertThat(version("2.1.2").isSameMinorAndNewerThan(version("2.1.3"))).isFalse(); assertThat(version("2.1.2").isSameMinorAndNewerThan(version("2.1.3"))).isFalse();