From d16b1dee35880b1c6f9b8955a07afba75f9336c4 Mon Sep 17 00:00:00 2001 From: Jochen Mader Date: Mon, 10 Feb 2025 14:47:26 +0100 Subject: [PATCH 1/2] Upgrade compile target to JDK 17 --- .github/workflows/check.yml | 2 +- .github/workflows/etherip-package.yml | 2 +- edge-plugins/build.gradle.kts | 2 +- hivemq-edge/build.gradle.kts | 2 +- modules/hivemq-edge-module-etherip/build.gradle.kts | 2 +- modules/hivemq-edge-module-file/build.gradle.kts | 2 +- modules/hivemq-edge-module-http/build.gradle.kts | 2 +- modules/hivemq-edge-module-modbus/build.gradle.kts | 2 +- modules/hivemq-edge-module-opcua/build.gradle.kts | 2 +- modules/hivemq-edge-module-plc4x/build.gradle.kts | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index f727cb286e..6a2dadec91 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -28,6 +28,6 @@ jobs: uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4 with: distribution: 'adopt' - java-version: '11' + java-version: '17' - name: Check run: ./gradlew test :hivemq-edge:forbiddenApis :hivemqEdgeZip diff --git a/.github/workflows/etherip-package.yml b/.github/workflows/etherip-package.yml index a28d37b543..ee85c736cb 100644 --- a/.github/workflows/etherip-package.yml +++ b/.github/workflows/etherip-package.yml @@ -21,7 +21,7 @@ jobs: uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4 with: distribution: 'adopt' - java-version: '11' + java-version: '17' - uses: whelk-io/maven-settings-xml-action@9dc09b23833fa9aa7f27b63db287951856f3433d # v3.0.0 with: servers: > diff --git a/edge-plugins/build.gradle.kts b/edge-plugins/build.gradle.kts index c161082c57..03a248ffc3 100644 --- a/edge-plugins/build.gradle.kts +++ b/edge-plugins/build.gradle.kts @@ -6,7 +6,7 @@ group = "com.hivemq" java { toolchain { - languageVersion.set(JavaLanguageVersion.of(11)) + languageVersion.set(JavaLanguageVersion.of(17)) } } diff --git a/hivemq-edge/build.gradle.kts b/hivemq-edge/build.gradle.kts index b799699255..2beade89aa 100644 --- a/hivemq-edge/build.gradle.kts +++ b/hivemq-edge/build.gradle.kts @@ -95,7 +95,7 @@ metadata { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(11)) + languageVersion.set(JavaLanguageVersion.of(17)) } withJavadocJar() withSourcesJar() diff --git a/modules/hivemq-edge-module-etherip/build.gradle.kts b/modules/hivemq-edge-module-etherip/build.gradle.kts index 57695d8d5c..60500f1bab 100644 --- a/modules/hivemq-edge-module-etherip/build.gradle.kts +++ b/modules/hivemq-edge-module-etherip/build.gradle.kts @@ -16,7 +16,7 @@ group = "com.hivemq" java { toolchain { - languageVersion.set(JavaLanguageVersion.of(11)) + languageVersion.set(JavaLanguageVersion.of(17)) } } diff --git a/modules/hivemq-edge-module-file/build.gradle.kts b/modules/hivemq-edge-module-file/build.gradle.kts index 33c9912e0b..f5d2fe6f9c 100644 --- a/modules/hivemq-edge-module-file/build.gradle.kts +++ b/modules/hivemq-edge-module-file/build.gradle.kts @@ -15,7 +15,7 @@ group = "com.hivemq" java { toolchain { - languageVersion.set(JavaLanguageVersion.of(11)) + languageVersion.set(JavaLanguageVersion.of(17)) } } diff --git a/modules/hivemq-edge-module-http/build.gradle.kts b/modules/hivemq-edge-module-http/build.gradle.kts index 4044d87e9a..3564bdbf2b 100644 --- a/modules/hivemq-edge-module-http/build.gradle.kts +++ b/modules/hivemq-edge-module-http/build.gradle.kts @@ -15,7 +15,7 @@ group = "com.hivemq" java { toolchain { - languageVersion.set(JavaLanguageVersion.of(11)) + languageVersion.set(JavaLanguageVersion.of(17)) } } diff --git a/modules/hivemq-edge-module-modbus/build.gradle.kts b/modules/hivemq-edge-module-modbus/build.gradle.kts index a5b1cc221a..f673dfc07d 100644 --- a/modules/hivemq-edge-module-modbus/build.gradle.kts +++ b/modules/hivemq-edge-module-modbus/build.gradle.kts @@ -15,7 +15,7 @@ group = "com.hivemq" java { toolchain { - languageVersion.set(JavaLanguageVersion.of(11)) + languageVersion.set(JavaLanguageVersion.of(17)) } } diff --git a/modules/hivemq-edge-module-opcua/build.gradle.kts b/modules/hivemq-edge-module-opcua/build.gradle.kts index 154071421e..adeb768ae1 100644 --- a/modules/hivemq-edge-module-opcua/build.gradle.kts +++ b/modules/hivemq-edge-module-opcua/build.gradle.kts @@ -15,7 +15,7 @@ group = "com.hivemq" java { toolchain { - languageVersion.set(JavaLanguageVersion.of(11)) + languageVersion.set(JavaLanguageVersion.of(17)) } } diff --git a/modules/hivemq-edge-module-plc4x/build.gradle.kts b/modules/hivemq-edge-module-plc4x/build.gradle.kts index 15a8cabfc4..da44f6d6f7 100644 --- a/modules/hivemq-edge-module-plc4x/build.gradle.kts +++ b/modules/hivemq-edge-module-plc4x/build.gradle.kts @@ -16,7 +16,7 @@ group = "com.hivemq" java { toolchain { - languageVersion.set(JavaLanguageVersion.of(11)) + languageVersion.set(JavaLanguageVersion.of(17)) } } From 9c6275c23462410e10190b6a15e23a3ea2cdc11d Mon Sep 17 00:00:00 2001 From: Jochen Mader Date: Mon, 10 Feb 2025 15:12:17 +0100 Subject: [PATCH 2/2] Additional access to util required for base --- hivemq-edge/build.gradle.kts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hivemq-edge/build.gradle.kts b/hivemq-edge/build.gradle.kts index 2beade89aa..94c6a4fd4e 100644 --- a/hivemq-edge/build.gradle.kts +++ b/hivemq-edge/build.gradle.kts @@ -253,6 +253,8 @@ tasks.test { "--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED", "--add-opens", + "java.base/java.util=ALL-UNNAMED", + "--add-opens", "jdk.management/com.sun.management.internal=ALL-UNNAMED", "--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED"