Fix maven release action (#21)

* Use dropdown to select type of release in workflow * Use maven-release action from personal repo
WebOfTrustInfo · Jan 24, 2022 · cf5d608 · cf5d608
1 parent 337a06c
commit cf5d608
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 21 deletions.
diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
@@ -3,22 +3,15 @@ name: Maven release
 on:
   workflow_dispatch:
     inputs:
-      version-minor:
-        description: 'Minor version upgrade'
+      version-core:
+        description: 'Major, Minor or Patch release'
         type: choice
-        required: false
-        default: "true"
+        required: true
+        default: 'minor'
         options:
-          - "true"
-          - "false"
-      version-major:
-        description: 'Major version upgrade'
-        type: choice
-        required: false
-        default: "false"
-        options:
-          - "true"
-          - "false"
+          - "major"
+          - "minor"
+          - "patch"
 
 jobs:
   build:
@@ -38,20 +31,21 @@ jobs:
             ci/data/gh-workflows/maven-release-workflow token | TOKEN
 
       - name: Release to Danubetech Nexus
-        uses: qcastel/github-actions-maven-release@v1.12.25
+        uses: BernhardFuchs/docker-maven-release@use-dynamic-input
         with:
           release-branch-name: main
           maven-repo-server-id: danubetech-maven-releases
           maven-repo-server-username: ${{ env.MAVEN_USERNAME }}
           maven-repo-server-password: ${{ env.MAVEN_PASSWORD }}
           access-token: ${{ env.TOKEN }}
-          version-minor: ${{ github.event.inputs.version-minor }}
-          version-major: ${{ github.event.inputs.version-major }}
-          maven-development-version-number: ${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}-SNAPSHOT
-          maven-release-version-number: ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.0
+          version-core: ${{ github.event.inputs.version-core }}
+          maven-development-version-format-minor: ${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}-SNAPSHOT
+          maven-development-version-format-major: ${parsedVersion.nextMajorVersion}.1-SNAPSHOT
+          maven-release-version-format-minor: ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.0
+          maven-release-version-format-major: ${parsedVersion.nextMajorVersion}.0.0
           git-release-bot-name: "admin-bot"
           git-release-bot-email: "admin@danubetech.com"
-          maven-args: "-Dmaven.javadoc.skip=true -DskipTests -DskipITs"
+          maven-args: "-Dmaven.javadoc.skip=true -DskipITs"
 
       - name: Slack notification
         if: failure()

diff --git a/pom.xml b/pom.xml
@@ -63,7 +63,7 @@
 				<version>${maven-release-plugin.version}</version>
 				<configuration>
 					<scmCommentPrefix>[skip ci]</scmCommentPrefix>
-					<tagNameFormat>v@{project.version}</tagNameFormat>
+					<tagNameFormat>@{project.version}</tagNameFormat>
 				</configuration>
 			</plugin>
 			<plugin>