Merge branch 'main' into release

.gitlab-ci.yml

@@ -369,7 +369,7 @@ deploy-release:
     - ./mvnw $MAVEN_CLI_OPTS $MAVEN_OPTS validate -DremoveSnapshot
     - ./mvnw $MAVEN_CLI_OPTS $MAVEN_OPTS deploy -DskipTests
     - export RELEASE_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
-    - if [[ $VERSION =~ .*SNAPSHOT ]]; then exit 1; fi
+    - if [[ $RELEASE_VERSION =~ .*SNAPSHOT ]]; then exit 1; fi
     - export RELEASE_TAG="v${RELEASE_VERSION}"
     - git add pom.xml
     - git commit -m "[ci skip] Set release version ${RELEASE_VERSION}"
@@ -397,7 +397,7 @@ update_model_ALTERNARIA:
   script:
     - apk add --no-cache openjdk11
     - export RELEASE_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_ALTERNARIA" -t $MAIN_BRANCH $ALTERNARIA_PROJECT_ID -e VERSION=$RELEASE_VERSION
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_ALTERNARIA" -t $MAIN_BRANCH $ALTERNARIA_PROJECT_ID -e RELEASE_VERSION=$RELEASE_VERSION
   tags:
     - vips-java
   rules:

pom.xml

@@ -10,7 +10,7 @@
 
     <groupId>no.nibio.vips</groupId>
     <artifactId>VIPSCommon</artifactId>
-    <version>2.0.4</version>
+    <version>2.0.5-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>VIPSCommon</name>