Skip to content

Commit

Permalink
Upgrade to Java 17
Browse files Browse the repository at this point in the history
  • Loading branch information
pSub committed Mar 5, 2024
1 parent 5b11cd6 commit 2bb3105
Show file tree
Hide file tree
Showing 9 changed files with 33 additions and 13 deletions.
14 changes: 10 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Disabling shallow clone is recommended for improving relevancy of reporting
- name: Set up JDK 1.11
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: '11'
java-version: '17'
distribution: 'adopt'
cache: maven
- name: Build with Maven
Expand All @@ -46,6 +46,12 @@ jobs:
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'adopt'
cache: maven
- env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
Expand All @@ -57,10 +63,10 @@ jobs:
needs: build-dmn-check
steps:
- uses: actions/checkout@v4
- name: Set up JDK 1.11
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: '11'
java-version: '17'
distribution: 'adopt'
cache: maven
- name: Build with Gradle
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'adopt'

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/javadoc-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ jobs:
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
javadoc-branch: javadoc
java-version: 11
java-version: 17
target-folder: javadoc
2 changes: 1 addition & 1 deletion .github/workflows/jib-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ jobs:
uses: MathieuSoysal/jib-container-publish.yml@main
with:
PASSWORD: ${{ secrets.GITHUB_TOKEN }}
java-version: 11
java-version: 17
module: cli
main-class: de.redsix.dmncheck.cli.Main
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Set up Maven Central Repository
uses: actions/setup-java@v4
with:
java-version: '11'
java-version: '17'
distribution: 'adopt'
cache: maven
server-id: ossrh
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
- name: Set up Java
uses: actions/setup-java@v4
with:
java-version: '11'
java-version: '17'
distribution: 'adopt'
cache: maven
- name: Publish package
Expand Down
2 changes: 1 addition & 1 deletion .lgtm.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
extraction:
java:
index:
java_version: "11"
java_version: "17"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ to skim the specification.

### Prerequisites

This plugin requires Java 11 or later and Apache Maven 3 or later. Some analyses are tailored towards the Camunda DMN implementation and
This plugin requires Java 17 or later and Apache Maven 3 or later. Some analyses are tailored towards the Camunda DMN implementation and
might not work for different DMN implementations.

### Usage
Expand Down
4 changes: 2 additions & 2 deletions gradle-plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ group 'de.redsix'
description 'Gradle Plugin for the DMN analysis tool dmn-check'
version '1.4.0-SNAPSHOT'

sourceCompatibility = 1.11
targetCompatibility = 1.11
sourceCompatibility = 1.17
targetCompatibility = 1.17

repositories {
mavenLocal()
Expand Down
10 changes: 9 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
</distributionManagement>

<properties>
<java.version>11</java.version>
<java.version>17</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.outputTimestamp>2023-01-01T00:00:00Z</project.build.outputTimestamp>

Expand Down Expand Up @@ -257,6 +257,14 @@

<compilerArgs>
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
<arg>-Astubs=checkerframework/stubs</arg>
<arg>-AstubWarnIfNotFound</arg>
</compilerArgs>
Expand Down

0 comments on commit 2bb3105

Please sign in to comment.