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

#159 - Consider SNAPSHOT/BUILD-SNAPSHOT format for BOMs.

Browse Source
This commit is contained in:
Mark Paluch
2020-12-02 15:22:06 +01:00
parent c99d6fcdea
commit 13ba67268c
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
release-tools/src/main/java/org/springframework/data/release/dependency/DependencyVersion.java
View File

@@ -38,7 +38,7 @@ import org.springframework.data.release.model.Version;
class DependencyVersion implements Comparable<DependencyVersion> { class DependencyVersion implements Comparable<DependencyVersion> {
private static Pattern VERSION = Pattern.compile("((?>(?>\\d+)[\\.]?)+)(-[a-zA-Z]+)?(\\d+)?"); private static Pattern VERSION = Pattern.compile("((?>(?>\\d+)[\\.]?)+)(-[a-zA-Z]+)?(\\d+)?");
private static Pattern NAME_VERSION = Pattern.compile("([A-Za-z]+)-(RELEASE|SR(\\d+))"); private static Pattern NAME_VERSION = Pattern.compile("([A-Za-z]+)-(RELEASE|SR(\\d+)|SNAPSHOT|BUILD-SNAPSHOT)");
private static Comparator<DependencyVersion> VERSION_COMPARATOR = Comparator.comparing(DependencyVersion::getVersion) private static Comparator<DependencyVersion> VERSION_COMPARATOR = Comparator.comparing(DependencyVersion::getVersion)
.thenComparing((o1, o2) -> { .thenComparing((o1, o2) -> {
@@ -72,11 +72,16 @@ class DependencyVersion implements Comparable<DependencyVersion> {
if (bomMatcher.find()) { if (bomMatcher.find()) {
Version version = Version.of(0); Version version = Version.of(0);
String modifier = "";
if (identifier.contains("-SR")) { if (identifier.contains("-SR")) {
version = Version.of(Integer.parseInt(bomMatcher.group(3))); version = Version.of(Integer.parseInt(bomMatcher.group(3)));
} }
return new DependencyVersion(identifier, bomMatcher.group(1), version, "", 0, null); if (identifier.endsWith("-SNAPSHOT")) {
modifier = "SNAPSHOT";
}
return new DependencyVersion(identifier, bomMatcher.group(1), version, modifier, 0, null);
} }
Matcher versionMatcher = VERSION.matcher(identifier); Matcher versionMatcher = VERSION.matcher(identifier);
@@ -98,7 +103,7 @@ class DependencyVersion implements Comparable<DependencyVersion> {
counter != null ? Integer.parseInt(counter) : 0, null); counter != null ? Integer.parseInt(counter) : 0, null);
} }
throw new IllegalArgumentException(String.format("Cannot parse version identifier%s", identifier)); throw new IllegalArgumentException(String.format("Cannot parse version identifier %s", identifier));
} }
@Override @Override