Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion codestyle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.openhab.tools.sat</groupId>
<artifactId>pom</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<groupId>org.openhab.tools</groupId>
Expand Down
2 changes: 1 addition & 1 deletion custom-checks/checkstyle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.openhab.tools.sat.custom-checks</groupId>
<artifactId>pom</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>checkstyle</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion custom-checks/findbugs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.openhab.tools.sat.custom-checks</groupId>
<artifactId>pom</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>findbugs</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion custom-checks/pmd/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.openhab.tools.sat.custom-checks</groupId>
<artifactId>pom</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>pmd</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion custom-checks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.openhab.tools.sat</groupId>
<artifactId>pom</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<groupId>org.openhab.tools.sat.custom-checks</groupId>
Expand Down
16 changes: 7 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.openhab.tools.sat</groupId>
<artifactId>pom</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Static Code Analysis Tool Parent POM</name>
Expand Down Expand Up @@ -56,7 +56,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<oh.java.version>11</oh.java.version>
<oh.java.version>21</oh.java.version>
<maven.compiler.release>${oh.java.version}</maven.compiler.release>
<maven.eclipse.version>2.10</maven.eclipse.version>
<junit.version>5.11.4</junit.version>
Expand All @@ -67,7 +67,7 @@
<pmd.version>7.18.0</pmd.version>
<checkstyle.version>10.26.1</checkstyle.version>
<spotbugs.version>4.9.8</spotbugs.version>
<maven.core.version>3.9.11</maven.core.version>
<maven.core.version>3.9.12</maven.core.version>
<maven.plugin.api.version>3.9.12</maven.plugin.api.version>
<maven.plugin.annotations.version>3.15.2</maven.plugin.annotations.version>
<maven.plugin.plugin.version>3.15.2</maven.plugin.plugin.version>
Expand Down Expand Up @@ -399,14 +399,12 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-eclipse</artifactId>
<!-- cannot go beyond 2.12.1 as long as Java11 is in use -->
<version>2.12.1</version>
<version>2.16.1</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>ecj</artifactId>
<!-- cannot go beyond 3.33.0 as long as Java11 is in use -->
<version>3.33.0</version>
<version>3.43.0</version>
</dependency>
</dependencies>
</plugin>
Expand All @@ -432,7 +430,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.12.0</version>
<configuration>
<source>11</source>
<source>21</source>
<outputDirectory>${project.build.directory}/javadoc</outputDirectory>
<doclint>all,-missing</doclint>
<failOnError>true</failOnError>
Expand Down Expand Up @@ -461,7 +459,7 @@
<version>3.6.3</version>
</requireMavenVersion>
<requireJavaVersion>
<version>[11.0,12.0)</version>
<version>[21.0,22.0),[25.0,26.0)</version>
</requireJavaVersion>
</rules>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion sat-extension/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.openhab.tools.sat</groupId>
<artifactId>pom</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>sat-extension</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion sat-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.openhab.tools.sat</groupId>
<artifactId>pom</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>sat-plugin</artifactId>
Expand Down