diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 0463d3e4..6f8d105d 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ '11' ] + java: [ '21', '25' ] os: [ 'ubuntu-24.04' ] name: Build (Java ${{ matrix.java }}, ${{ matrix.os }}) runs-on: ${{ matrix.os }} @@ -67,7 +67,7 @@ jobs: path: build.log - name: Upload SAT Summary Report - if: ${{ always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }} + if: ${{ always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) && (matrix.java == '21') }} uses: actions/upload-artifact@v6 with: name: sat-summary-report diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c89b435c..2b79229b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,11 +10,11 @@ on: workflow_dispatch: inputs: release_version: - description: 'Release version (e.g., 0.18.0)' + description: 'Release version (e.g., 1.0.0)' required: true type: string next_snapshot_version: - description: 'Next snapshot version (e.g., 0.19.0-SNAPSHOT)' + description: 'Next snapshot version (e.g., 1.1.0-SNAPSHOT)' required: true type: string @@ -30,10 +30,10 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} fetch-depth: 0 - - name: Set up JDK 11 + - name: Set up JDK 21 uses: actions/setup-java@v5 with: - java-version: 11 + java-version: 21 distribution: 'temurin' cache: maven server-id: maven diff --git a/codestyle/pom.xml b/codestyle/pom.xml index cea510fd..c63c6203 100644 --- a/codestyle/pom.xml +++ b/codestyle/pom.xml @@ -7,7 +7,7 @@ org.openhab.tools.sat pom - 0.19.0-SNAPSHOT + 1.0.0-SNAPSHOT org.openhab.tools diff --git a/custom-checks/checkstyle/pom.xml b/custom-checks/checkstyle/pom.xml index c5de0515..e0082d04 100644 --- a/custom-checks/checkstyle/pom.xml +++ b/custom-checks/checkstyle/pom.xml @@ -7,7 +7,7 @@ org.openhab.tools.sat.custom-checks pom - 0.19.0-SNAPSHOT + 1.0.0-SNAPSHOT checkstyle diff --git a/custom-checks/findbugs/pom.xml b/custom-checks/findbugs/pom.xml index 72255363..e7158860 100644 --- a/custom-checks/findbugs/pom.xml +++ b/custom-checks/findbugs/pom.xml @@ -7,7 +7,7 @@ org.openhab.tools.sat.custom-checks pom - 0.19.0-SNAPSHOT + 1.0.0-SNAPSHOT findbugs diff --git a/custom-checks/pmd/pom.xml b/custom-checks/pmd/pom.xml index 4dfec2b9..3b86f80b 100644 --- a/custom-checks/pmd/pom.xml +++ b/custom-checks/pmd/pom.xml @@ -7,7 +7,7 @@ org.openhab.tools.sat.custom-checks pom - 0.19.0-SNAPSHOT + 1.0.0-SNAPSHOT pmd diff --git a/custom-checks/pom.xml b/custom-checks/pom.xml index daf19670..5963e801 100644 --- a/custom-checks/pom.xml +++ b/custom-checks/pom.xml @@ -7,7 +7,7 @@ org.openhab.tools.sat pom - 0.19.0-SNAPSHOT + 1.0.0-SNAPSHOT org.openhab.tools.sat.custom-checks diff --git a/pom.xml b/pom.xml index a81a0fd1..c83e42b1 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.openhab.tools.sat pom - 0.19.0-SNAPSHOT + 1.0.0-SNAPSHOT pom Static Code Analysis Tool Parent POM @@ -56,7 +56,7 @@ UTF-8 - 11 + 21 ${oh.java.version} 2.10 5.11.4 @@ -67,7 +67,7 @@ 7.18.0 10.26.1 4.9.8 - 3.9.11 + 3.9.12 3.9.12 3.15.2 3.15.2 @@ -399,14 +399,12 @@ org.codehaus.plexus plexus-compiler-eclipse - - 2.12.1 + 2.16.1 org.eclipse.jdt ecj - - 3.33.0 + 3.43.0 @@ -432,7 +430,7 @@ maven-javadoc-plugin 3.12.0 - 11 + 21 ${project.build.directory}/javadoc all,-missing true @@ -461,7 +459,7 @@ 3.6.3 - [11.0,12.0) + [21.0,22.0),[25.0,26.0) diff --git a/sat-extension/pom.xml b/sat-extension/pom.xml index 55c1d7b9..5f5803bc 100644 --- a/sat-extension/pom.xml +++ b/sat-extension/pom.xml @@ -7,7 +7,7 @@ org.openhab.tools.sat pom - 0.19.0-SNAPSHOT + 1.0.0-SNAPSHOT sat-extension diff --git a/sat-plugin/pom.xml b/sat-plugin/pom.xml index f989b6da..12bb3fd4 100644 --- a/sat-plugin/pom.xml +++ b/sat-plugin/pom.xml @@ -7,7 +7,7 @@ org.openhab.tools.sat pom - 0.19.0-SNAPSHOT + 1.0.0-SNAPSHOT sat-plugin