From dd3ef3ab1868f42c4449dfa4a14c821428228765 Mon Sep 17 00:00:00 2001 From: Arindy Date: Tue, 11 Feb 2025 22:11:09 +0100 Subject: [PATCH] uses mvn:versions instead of jgitver --- .github/workflows/ci.yaml | 1 + .mvn/extensions.xml | 8 -------- .mvn/jgitver.config.xml | 12 ------------ pom.xml | 15 ++++----------- 4 files changed, 5 insertions(+), 31 deletions(-) delete mode 100644 .mvn/extensions.xml delete mode 100644 .mvn/jgitver.config.xml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1ad0e2d..d2199b5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -50,5 +50,6 @@ jobs: - name: create tag if: github.ref_name == 'main' run: | + echo ${{ steps.version.outputs.version }} git tag ${{ steps.version.outputs.version }} -m "release ${{ steps.version.outputs.version }}" git push origin ${{ steps.version.outputs.version }} diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml deleted file mode 100644 index b909513..0000000 --- a/.mvn/extensions.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - fr.brouillard.oss - jgitver-maven-plugin - 1.9.0 - - diff --git a/.mvn/jgitver.config.xml b/.mvn/jgitver.config.xml deleted file mode 100644 index f3a988f..0000000 --- a/.mvn/jgitver.config.xml +++ /dev/null @@ -1,12 +0,0 @@ - - MAX - true - true - false - true - 8 - main - true - diff --git a/pom.xml b/pom.xml index 633dbe8..2f209de 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.arindy dice-tower - 0 + 1.0.0-SNAPSHOT 3.13.0 @@ -284,17 +284,10 @@ 3.0.0 - regex-property + next-version - regex-property + parse-version - - tag.version - ${jgitver.calculated_version} - -SNAPSHOT - - true - @@ -310,7 +303,7 @@ set - ${tag.version} + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.nextIncrementalVersion}