From cabba8798db2ce416c1adcda7c918f3cbebe146a Mon Sep 17 00:00:00 2001 From: Chris Bono Date: Tue, 20 Feb 2024 01:07:59 -0600 Subject: [PATCH] [CI] Pull up common next snapshot version task --- .../gradle/versions/UpdateProjectVersionTask.java | 13 +++++++++++++ .../UpdateToNextBootSnapshotVersionTask.java | 12 ------------ .../versions/UpdateToSnapshotVersionTask.java | 12 ------------ 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/pulsar/gradle/versions/UpdateProjectVersionTask.java b/buildSrc/src/main/java/org/springframework/pulsar/gradle/versions/UpdateProjectVersionTask.java index 33f2ab46..98ca04ce 100644 --- a/buildSrc/src/main/java/org/springframework/pulsar/gradle/versions/UpdateProjectVersionTask.java +++ b/buildSrc/src/main/java/org/springframework/pulsar/gradle/versions/UpdateProjectVersionTask.java @@ -107,6 +107,19 @@ public abstract class UpdateProjectVersionTask extends DefaultTask { .getDisplayName(); } + protected String calculateNextSnapshotVersion(String version) { + VersionInfo versionSegments = parseVersion(version); + String majorSegment = versionSegments.major(); + String minorSegment = versionSegments.minor(); + String patchSegment = versionSegments.patch(); + String modifier = versionSegments.modifier(); + System.out.println("modifier = " + modifier); + if (modifier == null) { + patchSegment = String.valueOf(Integer.parseInt(patchSegment) + 1); + } + return "%s.%s.%s-SNAPSHOT".formatted(majorSegment, minorSegment, patchSegment); + } + record VersionInfo(String major, String minor, String patch, @Nullable String modifier) { } } diff --git a/buildSrc/src/main/java/org/springframework/pulsar/gradle/versions/UpdateToNextBootSnapshotVersionTask.java b/buildSrc/src/main/java/org/springframework/pulsar/gradle/versions/UpdateToNextBootSnapshotVersionTask.java index 40a4e71d..c0f1aacb 100644 --- a/buildSrc/src/main/java/org/springframework/pulsar/gradle/versions/UpdateToNextBootSnapshotVersionTask.java +++ b/buildSrc/src/main/java/org/springframework/pulsar/gradle/versions/UpdateToNextBootSnapshotVersionTask.java @@ -28,16 +28,4 @@ public abstract class UpdateToNextBootSnapshotVersionTask extends UpdateProjectV updateVersionInTomlVersions(SPRING_BOOT_VERSION_FOR_SAMPLES_PROPERTY, SPRING_BOOT_VERSION_FOR_DOCS_PROPERTY, this::calculateNextSnapshotVersion); } - private String calculateNextSnapshotVersion(String version) { - VersionInfo versionSegments = parseVersion(version); - String majorSegment = versionSegments.major(); - String minorSegment = versionSegments.minor(); - String patchSegment = versionSegments.patch(); - String modifier = versionSegments.modifier(); - if (modifier == null) { - patchSegment = String.valueOf(Integer.parseInt(patchSegment) + 1); - } - return "%s.%s.%s-SNAPSHOT".formatted(majorSegment, minorSegment, patchSegment); - } - } diff --git a/buildSrc/src/main/java/org/springframework/pulsar/gradle/versions/UpdateToSnapshotVersionTask.java b/buildSrc/src/main/java/org/springframework/pulsar/gradle/versions/UpdateToSnapshotVersionTask.java index bbf24085..026144c2 100644 --- a/buildSrc/src/main/java/org/springframework/pulsar/gradle/versions/UpdateToSnapshotVersionTask.java +++ b/buildSrc/src/main/java/org/springframework/pulsar/gradle/versions/UpdateToSnapshotVersionTask.java @@ -28,16 +28,4 @@ public abstract class UpdateToSnapshotVersionTask extends UpdateProjectVersionTa updateVersionInGradleProperties(VERSION_FOR_SAMPLES_PROPERTY, currentVersion); } - private String calculateNextSnapshotVersion(String version) { - VersionInfo versionSegments = parseVersion(version); - String majorSegment = versionSegments.major(); - String minorSegment = versionSegments.minor(); - String patchSegment = versionSegments.patch(); - String modifier = versionSegments.modifier(); - System.out.println("modifier = " + modifier); - if (modifier == null) { - patchSegment = String.valueOf(Integer.parseInt(patchSegment) + 1); - } - return "%s.%s.%s-SNAPSHOT".formatted(majorSegment, minorSegment, patchSegment); - } }