Skip to content

Commit

Permalink
Issue #498: update to checkstyle 10.13.0
Browse files Browse the repository at this point in the history
  • Loading branch information
muhlba91 committed Jan 29, 2024
1 parent 8462c9e commit 1f97812
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2
jobs:
build-project:
docker:
- image: cimg/openjdk:11.0.16
- image: cimg/openjdk:21.0.2

steps:
- checkout
Expand All @@ -15,7 +15,7 @@ jobs:

execute-sonar:
docker:
- image: sonarqube:9.0-community
- image: sonarqube:9.9-community
working_directory: ~/repo

environment:
Expand Down
29 changes: 16 additions & 13 deletions .github/workflows/sonar-checkstyle-workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ install:
matrix:
fast_finish: true
include:
- jdk: openjdk11
- jdk: openjdk21
env: CMD="./.ci/ci.sh install"

script:
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
</ciManagement>

<properties>
<checkstyle.version>10.12.5</checkstyle.version>
<checkstyle.version>10.13.0</checkstyle.version>
<sonar.version>8.9.0.43852</sonar.version>
<sonar-java.version>7.2.0.26923</sonar-java.version>
<maven.sevntu.checkstyle.plugin.version>1.44.1</maven.sevntu.checkstyle.plugin.version>
Expand Down

0 comments on commit 1f97812

Please sign in to comment.