From d0b1473d069dddbb1493bea590c42928e1dd5a7e Mon Sep 17 00:00:00 2001
From: Pierre Pouchin <pierre.pouchin@uca.fr>
Date: Mon, 6 Nov 2023 16:12:23 +0100
Subject: [PATCH] Bump version

---
 .github/workflows/maven.yml | 8 +++++---
 pom.xml                     | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 6c2cee7..f68c409 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -13,10 +13,10 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
       - name: Cache Maven packages
         uses: actions/cache@v3
@@ -24,15 +24,17 @@ jobs:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2-${{ secrets.CACHE_VERSION }}
-      - name: Append 'SNAPSHOT' to version if 'push' happened on 'main'
+      - name: Make sure to append 'SNAPSHOT' to version if 'push' happened on 'main'
         if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
         run: |
+          mvn versions:set -DremoveSnapshot
           mvn help:evaluate -N -Dexpression=project.version|grep -v '\['
           VERSION=$(mvn help:evaluate -N -Dexpression=project.version|grep -v '\[')
           mvn versions:set -DnewVersion=$VERSION-SNAPSHOT
       - name: Append branch name to version if 'push' did not happen on 'main' or a tag
         if: ${{ github.event_name == 'push' && github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/tags/')}}
         run: |
+          mvn versions:set -DremoveSnapshot
           mvn help:evaluate -N -Dexpression=project.version|grep -v '\['
           VERSION=$(mvn help:evaluate -N -Dexpression=project.version|grep -v '\[')
           mvn versions:set -DnewVersion=$VERSION-${GITHUB_REF##*/}
diff --git a/pom.xml b/pom.xml
index f96ea82..cdd52f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>fr.igred</groupId>
     <artifactId>omero_batch-plugin</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1-SNAPSHOT</version>
 
     <name>omero_batch-plugin</name>
     <description>ImageJ plugin to batch process images from OMERO.</description>