diff --git a/client/pom.xml b/client/pom.xml index 435c5666..9b54fc97 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -8,7 +8,7 @@ ctbrec master - 5.3.2 + 25.05.05 ../master diff --git a/client/src/main/java/ctbrec/ui/CamrecApplication.java b/client/src/main/java/ctbrec/ui/CamrecApplication.java index db824b32..bb680d7a 100644 --- a/client/src/main/java/ctbrec/ui/CamrecApplication.java +++ b/client/src/main/java/ctbrec/ui/CamrecApplication.java @@ -223,7 +223,7 @@ public class CamrecApplication extends Application { LOG.debug("Creating GUI"); DesktopIntegration.setRecorder(recorder); DesktopIntegration.setPrimaryStage(primaryStage); - CamrecApplication.title = "CTB Recorder " + Version.getVersion(); + CamrecApplication.title = "CTB Recorder " + Version.getVersion().toDisplayString(); primaryStage.setTitle(title); InputStream icon = getClass().getResourceAsStream("/icon.png"); primaryStage.getIcons().add(new Image(icon)); diff --git a/common/pom.xml b/common/pom.xml index 94efdff9..c52b9bdf 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -8,7 +8,7 @@ ctbrec master - 5.3.2 + 25.05.05 ../master diff --git a/common/src/main/java/ctbrec/Version.java b/common/src/main/java/ctbrec/Version.java index c9ef90af..f79c6735 100644 --- a/common/src/main/java/ctbrec/Version.java +++ b/common/src/main/java/ctbrec/Version.java @@ -14,6 +14,11 @@ public class Version implements Comparable { int revision = 0; String designator = ""; + public String toDisplayString() { + return String.format("%02d.%02d.%02d", major, minor, revision) + + (designator.isEmpty() ? "" : "-" + designator); + } + public static Version of(String s) { Objects.requireNonNull(s, "Version string cannot be null"); Pattern p = Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)(?:-(.+))?"); diff --git a/master/pom.xml b/master/pom.xml index 594f407e..942ec475 100644 --- a/master/pom.xml +++ b/master/pom.xml @@ -11,7 +11,7 @@ ctbrec master pom - 5.3.2 + 25.05.05 ../common @@ -49,6 +49,11 @@ true + + org.codehaus.mojo + versions-maven-plugin + 2.15.0 + diff --git a/server/pom.xml b/server/pom.xml index 54d624cc..9192f55a 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -8,7 +8,7 @@ ctbrec master - 5.3.2 + 25.05.05 ../master diff --git a/update-version.sh b/update-version.sh new file mode 100755 index 00000000..37e063b2 --- /dev/null +++ b/update-version.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +# Usage: ./update-version.sh 1.2.3 +NEW_VERSION=$1 + +if [[ -z "$NEW_VERSION" ]]; then + echo "Usage: $0 " + exit 1 +fi + +pushd master + +echo "Updating Maven project version to $NEW_VERSION..." + +# Step 1: Update the parent POM and all modules +mvn versions:set -DnewVersion="$NEW_VERSION" + +# Step 2: Commit changes +mvn versions:commit + +echo "Version updated to $NEW_VERSION in all modules." + +popd \ No newline at end of file