Update Maven version

.github/workflows/build.yml

@@ -24,17 +24,17 @@ jobs:
         cache: maven
         settings-path: ${{ github.workspace }}/.mvn
     - name: Build webapp
-      run: mvn ${MAVEN_CLI_OPTS} ${MAVEN_GOALS} -DskipTests
+      run: ./mvnw ${MAVEN_CLI_OPTS} ${MAVEN_GOALS} -DskipTests
     - name: Test webapp
-      run: mvn ${MAVEN_CLI_OPTS} test
+      run: ./mvnw ${MAVEN_CLI_OPTS} test
     - name: Upload artifacts
       uses: actions/upload-artifact@v3
       with:
         name: webapp
         path: target/karaplan.war
     - name: Publish artifacts
       if: startsWith(github.ref, 'refs/tags')
-      run: mvn ${MAVEN_CLI_OPTS} deploy -DskipTests
+      run: ./mvnw ${MAVEN_CLI_OPTS} deploy -DskipTests
       env:
         GITHUB_TOKEN: ${{ github.token }}
     - name: Login to Docker registry

.gitlab-ci.yml

@@ -17,23 +17,23 @@ stages:
 
 build:
   stage: build
-  image: maven:3.6.3-openjdk-17
+  image: eclipse-temurin:17-jdk
   cache:
     key: ${CI_PROJECT_PATH_SLUG}
     paths:
       - .mvn/repository
   variables:
     MAVEN_OPTS: ${MVN_ENV_OPTS}
   script:
-    - mvn ${MVN_BUILD_OPTS} ${MVN_GOALS} -DskipTests
+    - ./mvnw ${MVN_BUILD_OPTS} ${MVN_GOALS} -DskipTests
   artifacts:
     paths:
       - target
     expire_in: 1h
 
 test:
   stage: test
-  image: maven:3.6.3-openjdk-17
+  image: eclipse-temurin:17-jdk
   dependencies:
     - build
   cache:
@@ -43,7 +43,7 @@ test:
   variables:
     MAVEN_OPTS: ${MVN_ENV_OPTS}
   script:
-    - mvn ${MVN_BUILD_OPTS} test
+    - ./mvnw ${MVN_BUILD_OPTS} test
   artifacts:
     reports:
       junit: target/surefire-reports/*.xml

.mvn/wrapper/maven-wrapper.properties

@@ -1 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

cloudbuild.yaml

@@ -1,11 +1,11 @@
 steps:
-- name: 'maven:3.6.3-openjdk-17'
-  entrypoint: 'mvn'
+- name: 'eclipse-temurin:17-jdk'
+  entrypoint: './mvnw'
   args: ['-B', '-Dfrontend-build', '-Ddocker-build', '-DskipTests', 'verify']
 - name: 'gcr.io/cloud-builders/docker'
-  args: ['build', '-t', 'eu.gcr.io/$PROJECT_ID/karaplan:$BRANCH_NAME', '.']
+  args: ['build', '-t', 'europe-west1-docker.pkg.dev/$PROJECT_ID/docker/karaplan:$BRANCH_NAME', '.']
   dir: 'target/docker-build'
-images: ['eu.gcr.io/$PROJECT_ID/karaplan:$BRANCH_NAME']
+images: ['europe-west1-docker.pkg.dev/$PROJECT_ID/docker/karaplan:$BRANCH_NAME']
 artifacts:
   objects:
     location: 'gs://$PROJECT_ID/karaplan/'