diff --git a/.ci/ci.sh b/.ci/ci.sh index af027a4a..101c8ee9 100755 --- a/.ci/ci.sh +++ b/.ci/ci.sh @@ -9,7 +9,7 @@ install) ;; integration-tests) - SONAR_APP_VERSION="8.9.3.48735" + SONAR_APP_VERSION="9.9.0.65466" if [[ ! -f ~/.m2/sonar-application-$SONAR_APP_VERSION.zip ]]; then URL="https://repox.jfrog.io/repox/sonarsource/org/sonarsource/sonarqube/" URL=$URL"sonar-application/$SONAR_APP_VERSION/sonar-application-$SONAR_APP_VERSION.zip" diff --git a/.circleci/config.yml b/.circleci/config.yml index e6b06caf..081a921d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2 jobs: build-project: docker: - - image: cimg/openjdk:11.0.16 + - image: cimg/openjdk:21.0.2 steps: - checkout @@ -15,7 +15,7 @@ jobs: execute-sonar: docker: - - image: sonarqube:9.0-community + - image: sonarqube:9.9-community working_directory: ~/repo environment: diff --git a/.github/workflows/sonar-checkstyle-workflows.yml b/.github/workflows/sonar-checkstyle-workflows.yml index 83dea960..3c92cb98 100644 --- a/.github/workflows/sonar-checkstyle-workflows.yml +++ b/.github/workflows/sonar-checkstyle-workflows.yml @@ -7,36 +7,39 @@ on: pull_request: jobs: - mvn-install-java-11: + mvn-install-java-17: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v1 + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 with: - java-version: 11 + java-version: 17 + distribution: 'temurin' - name: install run: "./.ci/ci.sh install" integration-tests: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v1 + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 with: - java-version: 11 + java-version: 17 + distribution: 'temurin' - name: run integration tests run: "./.ci/ci.sh integration-tests" nondex: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v1 + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 with: - java-version: 11 + java-version: 17 + distribution: 'temurin' - name: install run: "./.ci/ci.sh nondex" diff --git a/.travis.yml b/.travis.yml index 85ef0233..215d6e9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ install: matrix: fast_finish: true include: - - jdk: openjdk11 + - jdk: openjdk21 env: CMD="./.ci/ci.sh install" script: diff --git a/README.md b/README.md index 686728bd..51fc392b 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,8 @@ Compatibility matrix from checkstyle team: | Checkstyle Plugin | Sonar min | Sonar max | Checkstyle | Jdk | |-------------------|-----------|-----------|------------|-----| -| 10.12.5 | 9.0 | 10.0+ | 10.12.5 | 11 | +| 10.13.0 | 9.9 | 10.0+ | 10.13.0 | 11 | +| 10.12.5 | 9.9 | 10.0+ | 10.12.5 | 11 | | 10.12.3 | 9.0 | 10.0+ | 10.12.3 | 11 | | 10.12.1 | 9.0 | 10.0+ | 10.12.1 | 11 | | 10.12.0 | 9.0 | 10.0+ | 10.12.0 | 11 | diff --git a/pom.xml b/pom.xml index 85e84fd7..56128347 100644 --- a/pom.xml +++ b/pom.xml @@ -93,8 +93,7 @@ - 10.12.5 - 8.9.0.43852 + 10.13.0 7.2.0.26923 1.44.1 @@ -158,15 +157,15 @@ 32.0.0-jre - org.sonarsource.sonarqube + org.sonarsource.api.plugin sonar-plugin-api - ${sonar.version} + 9.9.0.229 provided org.sonarsource.sonarqube sonar-plugin-api-impl - ${sonar.version} + 9.9.0.65466 test @@ -225,7 +224,7 @@ org.sonarsource.sonarqube sonar-testing-harness test - ${sonar.version} + 9.9.0.65466 org.sonarsource.orchestrator @@ -266,7 +265,7 @@ org.sonarsource.sonarqube sonar-ws - ${sonar.version} + 9.9.0.65466 test diff --git a/src/it/java/org/checkstyle/plugins/sonar/RunPluginTest.java b/src/it/java/org/checkstyle/plugins/sonar/RunPluginTest.java index a469709a..40a2a952 100644 --- a/src/it/java/org/checkstyle/plugins/sonar/RunPluginTest.java +++ b/src/it/java/org/checkstyle/plugins/sonar/RunPluginTest.java @@ -61,7 +61,7 @@ */ public class RunPluginTest { private static final Logger LOG = LoggerFactory.getLogger(RunPluginTest.class); - private static final String SONAR_APP_VERSION = "8.9.3.48735"; + private static final String SONAR_APP_VERSION = "9.9.0.65466"; private static final int LOGS_NUMBER_LINES = 200; private static final String TRUE = "true"; private static final String PROJECT_KEY = "com.puppycrows.tools:checkstyle";