Skip to content

Commit 57828ed

Browse files
committed
[CI] Pull up common next snapshot version task [skip ci]
1 parent 3640693 commit 57828ed

File tree

3 files changed

+13
-24
lines changed

3 files changed

+13
-24
lines changed

Diff for: buildSrc/src/main/java/org/springframework/pulsar/gradle/versions/UpdateProjectVersionTask.java

+13
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,19 @@ protected String currentVersionInCatalog(Project project, String versionProperty
107107
.getDisplayName();
108108
}
109109

110+
protected String calculateNextSnapshotVersion(String version) {
111+
VersionInfo versionSegments = parseVersion(version);
112+
String majorSegment = versionSegments.major();
113+
String minorSegment = versionSegments.minor();
114+
String patchSegment = versionSegments.patch();
115+
String modifier = versionSegments.modifier();
116+
System.out.println("modifier = " + modifier);
117+
if (modifier == null) {
118+
patchSegment = String.valueOf(Integer.parseInt(patchSegment) + 1);
119+
}
120+
return "%s.%s.%s-SNAPSHOT".formatted(majorSegment, minorSegment, patchSegment);
121+
}
122+
110123
record VersionInfo(String major, String minor, String patch, @Nullable String modifier) {
111124
}
112125
}

Diff for: buildSrc/src/main/java/org/springframework/pulsar/gradle/versions/UpdateToNextBootSnapshotVersionTask.java

-12
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,4 @@ public void updateToBootSnapshotVersion() {
2828
updateVersionInTomlVersions(SPRING_BOOT_VERSION_FOR_SAMPLES_PROPERTY, SPRING_BOOT_VERSION_FOR_DOCS_PROPERTY, this::calculateNextSnapshotVersion);
2929
}
3030

31-
private String calculateNextSnapshotVersion(String version) {
32-
VersionInfo versionSegments = parseVersion(version);
33-
String majorSegment = versionSegments.major();
34-
String minorSegment = versionSegments.minor();
35-
String patchSegment = versionSegments.patch();
36-
String modifier = versionSegments.modifier();
37-
if (modifier == null) {
38-
patchSegment = String.valueOf(Integer.parseInt(patchSegment) + 1);
39-
}
40-
return "%s.%s.%s-SNAPSHOT".formatted(majorSegment, minorSegment, patchSegment);
41-
}
42-
4331
}

Diff for: buildSrc/src/main/java/org/springframework/pulsar/gradle/versions/UpdateToSnapshotVersionTask.java

-12
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,4 @@ public void updateToSnapshotVersion() {
2828
updateVersionInGradleProperties(VERSION_FOR_SAMPLES_PROPERTY, currentVersion);
2929
}
3030

31-
private String calculateNextSnapshotVersion(String version) {
32-
VersionInfo versionSegments = parseVersion(version);
33-
String majorSegment = versionSegments.major();
34-
String minorSegment = versionSegments.minor();
35-
String patchSegment = versionSegments.patch();
36-
String modifier = versionSegments.modifier();
37-
System.out.println("modifier = " + modifier);
38-
if (modifier == null) {
39-
patchSegment = String.valueOf(Integer.parseInt(patchSegment) + 1);
40-
}
41-
return "%s.%s.%s-SNAPSHOT".formatted(majorSegment, minorSegment, patchSegment);
42-
}
4331
}

0 commit comments

Comments
 (0)