From 2e6424ae4a1216a65cfad744852b0e5c45fa6823 Mon Sep 17 00:00:00 2001 From: Matthew Watkins Date: Tue, 31 Oct 2023 14:43:12 +0000 Subject: [PATCH] Chore: Update Sonar OpenJDK version Update to OpenJDK17 for Sonar jobs Also revert from JDK13->JDK11 where previous scope was incorrect Issue: RELENG-4962 Change-Id: I300c9ccbc47a5fe03354c6a088fd75dff8c55519 Signed-off-by: Matthew Watkins --- docs/jjb/lf-ci-jobs.rst | 6 +++--- docs/jjb/lf-maven-jobs.rst | 8 ++++---- jjb/lf-ci-jobs.yaml | 2 +- jjb/lf-maven-jobs.yaml | 6 +++--- jjb/lf-python-jobs.yaml | 11 ++++++----- releasenotes/notes/update-sonar-openjdk-1dc09ef5845e81e6.yaml | 7 +++++++ 6 files changed, 24 insertions(+), 16 deletions(-) create mode 100644 releasenotes/notes/update-sonar-openjdk-1dc09ef5845e81e6.yaml diff --git a/docs/jjb/lf-ci-jobs.rst b/docs/jjb/lf-ci-jobs.rst index d2ce2442..adba0d88 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: "openjdk13") + :sonarcloud-java-version: Version of Java to run the Sonar scan. (default: "openjdk17") 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: "openjdk13") + :sonarcloud-java-version: Version of Java to run the Sonar scan. (default: "openjdk17") 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: "openjdk13") + :sonarcloud-java-version: Version of Java to run the Sonar scan. (default: "openjdk17") diff --git a/docs/jjb/lf-maven-jobs.rst b/docs/jjb/lf-maven-jobs.rst index 78dfc875..5c786e15 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: openjdk13) + :java-version: Version of Java to execute Sonar with. (default: openjdk11) :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: openjdk13) + :sonarcloud-java-version: Version of Java to run the Sonar scan. (default: openjdk17) :sonarcloud-qualitygate-wait: SonarCloud flag that forces the analysis step to wait for the quality gate result. (default: false) @@ -587,7 +587,7 @@ multi-branch configuration. :sonarcloud-api-token-cred-id: Jenkins credential ID which has the SonarCloud API Token. This one SHOULDN'T be overwritten as we are standarizing the credential ID for all projects (default: 'sonarcloud-api-token') - :sonarcloud-java-version: Version of Java to use for the Sonar scan. (default: openjdk11) + :sonarcloud-java-version: Version of Java to use for the Sonar scan. (default: openjdk17) :stream: Keyword that represents a release code-name. Often the same as the branch. (default: master) :submodule-recursive: Whether to checkout submodules recursively. @@ -652,7 +652,7 @@ This job runs on dev branches and its triggered on new patchsets. :sonarcloud-api-token-cred-id: Jenkins credential ID which has the SonarCloud API Token. This one SHOULDN'T be overwritten as we are standarizing the credential ID for all projects (default: 'sonarcloud-api-token') - :sonarcloud-java-version: Version of Java to use for the Sonar scan. (default: openjdk11) + :sonarcloud-java-version: Version of Java to use for the Sonar scan. (default: openjdk17) :sonarcloud-qualitygate-wait: SonarCloud flag that forces the analysis step to wait for the quality gate result. (default: false) :stream: Keyword that represents a release code-name. diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index 0bfacdfe..65c95f20 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: openjdk13 + sonarcloud-java-version: openjdk17 stream: master submodule-recursive: true submodule-timeout: 10 diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml index 9a4692c4..00cafd2d 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: openjdk13 + java-version: openjdk11 mvn-global-settings: global-settings mvn-goals: clean install mvn-opts: "" @@ -1332,8 +1332,8 @@ sonarcloud-project-organization: "" sonarcloud-api-token-cred-id: sonarcloud-api-token sonarcloud-qualitygate-wait: false - # Projects not compatible with jdk13 can set java-version to something else - sonarcloud-java-version: openjdk13 + # Projects not compatible with jdk17 can set java-version to something else + sonarcloud-java-version: openjdk17 stream: master submodule-recursive: true submodule-timeout: 10 diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml index 85d95f95..738a0624 100644 --- a/jjb/lf-python-jobs.yaml +++ b/jjb/lf-python-jobs.yaml @@ -391,8 +391,9 @@ disable-job: false git-url: "$GIT_URL/$PROJECT" github-url: "https://github.com" - # Projects not compatible with jdk13 can set java-version to something else - java-version: openjdk13 + # 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 parallel: true pre-build-script: "# pre-build script goes here" python-version: python3 @@ -556,7 +557,7 @@ disable-job: false git-url: "$GIT_URL/$PROJECT" github-url: "https://github.com" - java-version: openjdk13 + java-version: openjdk11 mvn-global-settings: global-settings mvn-goals: validate mvn-opts: "" @@ -572,8 +573,8 @@ sonarcloud-project-organization: "" sonarcloud-api-token-cred-id: sonarcloud-api-token sonarcloud-qualitygate-wait: false - # Projects not compatible with jdk13 can set java-version to something else - sonarcloud-java-version: openjdk13 + # Projects not compatible with jdk17 can set java-version to something else + sonarcloud-java-version: openjdk17 stream: master submodule-recursive: true submodule-timeout: 10 diff --git a/releasenotes/notes/update-sonar-openjdk-1dc09ef5845e81e6.yaml b/releasenotes/notes/update-sonar-openjdk-1dc09ef5845e81e6.yaml new file mode 100644 index 00000000..95b9756b --- /dev/null +++ b/releasenotes/notes/update-sonar-openjdk-1dc09ef5845e81e6.yaml @@ -0,0 +1,7 @@ +--- +deprecations: + - | + Sonarcloud upload will stop working with java11 on November 15th 2023 + Update OpenJDK to release 17 for sonar jobs + Also revert from JDK13 -> JDK11 in a couple of places where the + previous release/update had unintended scope -- 2.16.6