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 @@
fr.igred
omero_batch-plugin
- 2.0.0
+ 2.0.1-SNAPSHOT
omero_batch-plugin
ImageJ plugin to batch process images from OMERO.