From 5feb135d5399e0fce4895d7b76d54c2e39429d56 Mon Sep 17 00:00:00 2001 From: Dimitris Kavvathas Date: Wed, 12 Jul 2023 19:03:55 +0200 Subject: [PATCH] SONAR-19650 Upgrade to Java 17 for Maven and Gradle images --- .../__tests__/__snapshots__/GitLabCITutorial-it.tsx.snap | 4 ++-- .../js/components/tutorials/gitlabci/commands/PipeCommand.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/sonar-web/src/main/js/components/tutorials/gitlabci/__tests__/__snapshots__/GitLabCITutorial-it.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/gitlabci/__tests__/__snapshots__/GitLabCITutorial-it.tsx.snap index d3ae770b821..e70bf7303d5 100644 --- a/server/sonar-web/src/main/js/components/tutorials/gitlabci/__tests__/__snapshots__/GitLabCITutorial-it.tsx.snap +++ b/server/sonar-web/src/main/js/components/tutorials/gitlabci/__tests__/__snapshots__/GitLabCITutorial-it.tsx.snap @@ -56,7 +56,7 @@ exports[`should follow and complete all steps: Gradle: gitlab-ci.yml 1`] = ` sonarqube-check: stage: sonarqube-check - image: gradle:jre11-slim + image: gradle:8.2.0-jdk17-jammy variables: SONAR_USER_HOME: "\${CI_PROJECT_DIR}/.sonar" # Defines the location of the analysis task cache GIT_DEPTH: "0" # Tells git to fetch all the branches of the project, required by the analysis task @@ -126,7 +126,7 @@ exports[`should follow and complete all steps: Maven: gitlab-ci.yml 1`] = ` sonarqube-check: stage: sonarqube-check - image: maven:3.6.3-jdk-11 + image: maven:3.9.3-eclipse-temurin-17 variables: SONAR_USER_HOME: "\${CI_PROJECT_DIR}/.sonar" # Defines the location of the analysis task cache GIT_DEPTH: "0" # Tells git to fetch all the branches of the project, required by the analysis task diff --git a/server/sonar-web/src/main/js/components/tutorials/gitlabci/commands/PipeCommand.tsx b/server/sonar-web/src/main/js/components/tutorials/gitlabci/commands/PipeCommand.tsx index 20b0c25132b..b47321d779b 100644 --- a/server/sonar-web/src/main/js/components/tutorials/gitlabci/commands/PipeCommand.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/gitlabci/commands/PipeCommand.tsx @@ -29,11 +29,11 @@ export interface PipeCommandProps { const BUILD_TOOL_SPECIFIC = { [BuildTools.Gradle]: { - image: 'gradle:jre11-slim', + image: 'gradle:8.2.0-jdk17-jammy', script: () => 'gradle sonar', }, [BuildTools.Maven]: { - image: 'maven:3.6.3-jdk-11', + image: 'maven:3.9.3-eclipse-temurin-17', script: () => ` - mvn verify sonar:sonar`, }, -- 2.39.5