From 54e4baa9508e156c13e49ee9f4f50be94f6a5f8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Blo=CC=88mer?= Date: Sat, 4 Jan 2025 14:30:49 +0100 Subject: [PATCH] Fix GraalJS on JDK 9+ --- .github/workflows/test.yaml | 5 ++-- pom.xml | 54 +++++++++++++++++++++++-------------- 2 files changed, 37 insertions(+), 22 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index b8d1889..5e1e821 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -14,12 +14,13 @@ jobs: strategy: matrix: os: [ ubuntu-latest, windows-latest] + java-version: [ 8, 11, 17 ] steps: - uses: actions/checkout@v3 - - name: Set up JDK 8 + - name: Set up JDK ${{ matrix.java-version }} uses: actions/setup-java@v3 with: - java-version: '8' + java-version: ${{ matrix.java-version }} distribution: 'adopt' cache: 'maven' - name: Set timezone on Windows diff --git a/pom.xml b/pom.xml index 1db570d..69c805d 100644 --- a/pom.xml +++ b/pom.xml @@ -56,11 +56,22 @@ UTF-8 - 21.3.8 git@github.com + 1.8 + 1.8 + 21.3.12 + 8 - + + javac-release + + [11,) + + + 8 + + release-sign-artifacts @@ -109,19 +120,17 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 - - 1.8 - 1.8 - + 3.13.0 org.apache.maven.plugins maven-surefire-plugin - 3.2.3 + 3.2.5 false + false false + @@ -173,7 +182,7 @@ maven-deploy-plugin - 3.1.1 + 3.1.3 deploy @@ -184,16 +193,25 @@ maven-clean-plugin - 3.3.1 + 3.3.2 maven-install-plugin - 3.1.1 + 3.1.3 org.apache.maven.plugins maven-jar-plugin - 3.3.0 + 3.4.2 + + + + + de.neuland.pug4j + + + maven-resources-plugin @@ -202,7 +220,7 @@ org.apache.maven.plugins maven-site-plugin - 4.0.0-M9 + 4.0.0-M16 @@ -274,11 +292,7 @@ org.graalvm.sdk graal-sdk ${graalvm.version} - - - org.graalvm.compiler - compiler - ${graalvm.version} + compile org.graalvm.js @@ -290,6 +304,7 @@ org.graalvm.js js-scriptengine ${graalvm.version} + runtime org.graalvm.tools @@ -303,13 +318,12 @@ ${graalvm.version} runtime - org.slf4j slf4j-simple - 2.0.10 + 2.0.13 test