From 5e7040b0710c05df16d1815be74214c5eb5f9239 Mon Sep 17 00:00:00 2001 From: Matthew Watkins Date: Thu, 26 Oct 2023 12:37:09 +0100 Subject: [PATCH] Chore: Update Sonar OpenJDK version Issue: RELENG-4962 Change-Id: I3aa37e4dc09d9efbbc99f5f12e61c29ce86d24d6 Signed-off-by: Matthew Watkins --- docs/jjb/lf-ci-jobs.rst | 6 +++--- docs/jjb/lf-maven-jobs.rst | 4 ++-- jjb/lf-ci-jobs.yaml | 2 +- jjb/lf-maven-jobs.yaml | 7 +++---- jjb/lf-python-jobs.yaml | 12 +++++------- .../notes/update-sonar-openjdk-ddafc91392e14148.yaml | 5 +++++ 6 files changed, 19 insertions(+), 17 deletions(-) create mode 100644 releasenotes/notes/update-sonar-openjdk-ddafc91392e14148.yaml diff --git a/docs/jjb/lf-ci-jobs.rst b/docs/jjb/lf-ci-jobs.rst index b8917244..d2ce2442 100644 --- a/docs/jjb/lf-ci-jobs.rst +++ b/docs/jjb/lf-ci-jobs.rst @@ -1008,7 +1008,7 @@ Plug-in configurations :sonar-properties: Sonar configuration properties. (default: "") :sonar-java-opts: JVM options. (default: "") :sonar-additional-args: Additional command line arguments. (default: "") - :sonarcloud-java-version: Version of Java to run the Sonar scan. (default: "openjdk11") + :sonarcloud-java-version: Version of Java to run the Sonar scan. (default: "openjdk13") Sonar with Prescan @@ -1041,7 +1041,7 @@ to run before the Sonar scan. :sonar-properties: Sonar configuration properties. (default: "") :sonar-java-opts: JVM options. (default: "") :sonar-additional-args: Additional command line arguments. (default: "") - :sonarcloud-java-version: Version of Java to run the Sonar scan. (default: "openjdk11") + :sonarcloud-java-version: Version of Java to run the Sonar scan. (default: "openjdk13") Sonar with Prescan Script @@ -1067,4 +1067,4 @@ build the project, execute unit tests and generate a code-coverage report. :sonar-properties: Sonar configuration properties. (default: "") :sonar-java-opts: JVM options. (default: "") :sonar-additional-args: Additional command line arguments. (default: "") - :sonarcloud-java-version: Version of Java to run the Sonar scan. (default: "openjdk11") + :sonarcloud-java-version: Version of Java to run the Sonar scan. (default: "openjdk13") diff --git a/docs/jjb/lf-maven-jobs.rst b/docs/jjb/lf-maven-jobs.rst index 8e4c6c26..78dfc875 100644 --- a/docs/jjb/lf-maven-jobs.rst +++ b/docs/jjb/lf-maven-jobs.rst @@ -23,7 +23,7 @@ Runs Sonar against a Maven project. :Required Parameters: - :java-version: Version of Java to execute Sonar with. (default: openjdk11) + :java-version: Version of Java to execute Sonar with. (default: openjdk13) :mvn-version: Version of Maven to execute Sonar with. :mvn-settings: Maven settings.xml file containing credentials to use. @@ -39,7 +39,7 @@ Runs Sonar against a Maven project and pushes results to SonarCloud. :mvn-settings: Maven settings.xml file containing credentials to use. :sonarcloud-project-key: SonarCloud project key. :sonarcloud-project-organization: SonarCloud project organization. - :sonarcloud-java-version: Version of Java to run the Sonar scan. (default: openjdk11) + :sonarcloud-java-version: Version of Java to run the Sonar scan. (default: openjdk13) :sonarcloud-qualitygate-wait: SonarCloud flag that forces the analysis step to wait for the quality gate result. (default: false) diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index 1c91b01b..0bfacdfe 100644 --- a/jjb/lf-ci-jobs.yaml +++ b/jjb/lf-ci-jobs.yaml @@ -2170,7 +2170,7 @@ disable-job: false git-url: "$GIT_URL/$PROJECT" github-url: "https://github.com" - sonarcloud-java-version: openjdk11 + sonarcloud-java-version: openjdk13 stream: master submodule-recursive: true submodule-timeout: 10 diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml index dec111f3..9a4692c4 100644 --- a/jjb/lf-maven-jobs.yaml +++ b/jjb/lf-maven-jobs.yaml @@ -140,7 +140,7 @@ disable-job: false git-url: "$GIT_URL/$PROJECT" github-url: "https://github.com" - java-version: openjdk11 + java-version: openjdk13 mvn-global-settings: global-settings mvn-goals: clean install mvn-opts: "" @@ -1332,9 +1332,8 @@ sonarcloud-project-organization: "" sonarcloud-api-token-cred-id: sonarcloud-api-token sonarcloud-qualitygate-wait: false - # SonarCloud scan using jdk8 will become deprecated by Oct, 2020 - # Projects not compatible with jdk11 can set java-version to something else - sonarcloud-java-version: openjdk11 + # Projects not compatible with jdk13 can set java-version to something else + sonarcloud-java-version: openjdk13 stream: master submodule-recursive: true submodule-timeout: 10 diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml index 0b60e4af..85d95f95 100644 --- a/jjb/lf-python-jobs.yaml +++ b/jjb/lf-python-jobs.yaml @@ -391,9 +391,8 @@ disable-job: false git-url: "$GIT_URL/$PROJECT" github-url: "https://github.com" - # SonarCloud scan using jdk8 will become deprecated by Oct, 2020 - # Projects not compatible with jdk11 can set java-version to something else - java-version: openjdk11 + # Projects not compatible with jdk13 can set java-version to something else + java-version: openjdk13 parallel: true pre-build-script: "# pre-build script goes here" python-version: python3 @@ -557,7 +556,7 @@ disable-job: false git-url: "$GIT_URL/$PROJECT" github-url: "https://github.com" - java-version: openjdk11 + java-version: openjdk13 mvn-global-settings: global-settings mvn-goals: validate mvn-opts: "" @@ -573,9 +572,8 @@ sonarcloud-project-organization: "" sonarcloud-api-token-cred-id: sonarcloud-api-token sonarcloud-qualitygate-wait: false - # SonarCloud scan using jdk8 will become deprecated by Oct, 2020 - # Projects not compatible with jdk11 can set java-version to something else - sonarcloud-java-version: openjdk11 + # Projects not compatible with jdk13 can set java-version to something else + sonarcloud-java-version: openjdk13 stream: master submodule-recursive: true submodule-timeout: 10 diff --git a/releasenotes/notes/update-sonar-openjdk-ddafc91392e14148.yaml b/releasenotes/notes/update-sonar-openjdk-ddafc91392e14148.yaml new file mode 100644 index 00000000..52517804 --- /dev/null +++ b/releasenotes/notes/update-sonar-openjdk-ddafc91392e14148.yaml @@ -0,0 +1,5 @@ +--- +deprecations: + - | + Sonarcloud upload will stop working with java11 on November 15th 2023 + Update OpenJDK to release 13 for sonar jobs -- 2.16.6