Merge branch 'main' into 'release'

Should not trigger pipeline

See merge request !29

.gitlab-ci.yml

@@ -45,7 +45,7 @@ build-for-staging:
     paths:
       - target/*.war
   rules:
-    - if: $CI_COMMIT_REF_NAME == $MAIN_BRANCH
+    - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH && $CI_PIPELINE_SOURCE != "merge_request_event"'
 
 build-for-production:
   stage: build
@@ -104,7 +104,7 @@ test:
   tags:
     - java
   rules:
-    - if: $CI_COMMIT_REF_NAME == $MAIN_BRANCH
+    - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH && $CI_PIPELINE_SOURCE != "merge_request_event"'
     - if: $CI_COMMIT_REF_NAME == $RELEASE_BRANCH
 
 deploy-to-staging:
@@ -142,7 +142,7 @@ deploy-to-staging:
   tags:
     - java
   rules:
-    - if: $CI_COMMIT_REF_NAME == $MAIN_BRANCH
+    - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH && $CI_PIPELINE_SOURCE != "merge_request_event"'
   environment:
     name: staging
     url: https://vipscore02test.nibio.no
@@ -158,7 +158,7 @@ upload-snapshot:
   tags:
     - java
   rules:
-    - if: $CI_COMMIT_REF_NAME == $MAIN_BRANCH
+    - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH && $CI_PIPELINE_SOURCE != "merge_request_event"'
 
 deploy-to-production:
   stage: deploy

pom.xml

@@ -9,7 +9,7 @@
     <groupId>no.nibio</groupId>
     <artifactId>VIPSCore</artifactId>
     <packaging>war</packaging>
-     <version>2.0.10</version>
+     <version>2.0.11-SNAPSHOT</version>
 
     <name>VIPSCore</name>
     <url>http://maven.apache.org</url>