From 942389269c415e9e9c7883e818bd2abd32b62db0 Mon Sep 17 00:00:00 2001 From: jarebudev <23311805+jarebudev@users.noreply.github.com> Date: Wed, 9 Apr 2025 16:23:08 +0100 Subject: [PATCH 1/4] moved sdk-contrib to JDK11 Signed-off-by: jarebudev <23311805+jarebudev@users.noreply.github.com> --- .github/workflows/ci.yml | 4 ++-- .sdkmanrc | 2 +- CONTRIBUTING.md | 4 ++-- pom.xml | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e63f3daf5..d82d8fc49 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,8 +16,8 @@ jobs: build: - java: 21 profile: codequality - - java: 8 - profile: java8 + - java: 11 + profile: java11 name: with Java ${{ matrix.build.java }} runs-on: ${{ matrix.os}} diff --git a/.sdkmanrc b/.sdkmanrc index 86eb302e5..5414da493 100644 --- a/.sdkmanrc +++ b/.sdkmanrc @@ -1 +1 @@ -java=8.0.312-tem +java=11.0.26-tem diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1486a4e7c..4df52a298 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,11 +2,11 @@ ## System Requirements -Java 8+ is required for the tooling, plugins, etc. Maven 3.8+ is recommended. +Java 11+ is required for the tooling, plugins, etc. Maven 3.8+ is recommended. ## Compilation target(s) -As in the Java-SDK, we target Java 8. The parent POM configures this automatically. +As in the Java-SDK, we target Java 11. The parent POM configures this automatically. ## Adding a module diff --git a/pom.xml b/pom.xml index dc226d6ec..90ecca9fe 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ false - 8 + 11 @@ -529,14 +529,14 @@ - + - java8 - + java11 + - (1.8,9) + [11,) true From f452a8fab2216686bb1283faaa895e61527b15f1 Mon Sep 17 00:00:00 2001 From: jarebudev <23311805+jarebudev@users.noreply.github.com> Date: Wed, 9 Apr 2025 16:48:01 +0100 Subject: [PATCH 2/4] testing removal of surefire argline Signed-off-by: jarebudev <23311805+jarebudev@users.noreply.github.com> --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 90ecca9fe..b517b63fc 100644 --- a/pom.xml +++ b/pom.xml @@ -374,9 +374,9 @@ ${testExclusions} - - @{surefireArgLine} - + + + From 48fdb86fad54465c8d36b4032062330fbdf474a0 Mon Sep 17 00:00:00 2001 From: jarebudev <23311805+jarebudev@users.noreply.github.com> Date: Wed, 9 Apr 2025 22:10:57 +0100 Subject: [PATCH 3/4] reinstated commented out argline. Changed Javadoc source to 11 Signed-off-by: jarebudev <23311805+jarebudev@users.noreply.github.com> --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index b517b63fc..585d2083a 100644 --- a/pom.xml +++ b/pom.xml @@ -293,7 +293,7 @@ all,-missing - 8 + 11 @@ -374,9 +374,9 @@ ${testExclusions} - - - + + @{surefireArgLine} + From 70c8735ec4c6a408ea876eed97522cfeb4e84a3c Mon Sep 17 00:00:00 2001 From: jarebudev <23311805+jarebudev@users.noreply.github.com> Date: Wed, 9 Apr 2025 23:18:47 +0100 Subject: [PATCH 4/4] added legacymode to javadoc generation Signed-off-by: jarebudev <23311805+jarebudev@users.noreply.github.com> --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 585d2083a..9a0717671 100644 --- a/pom.xml +++ b/pom.xml @@ -292,8 +292,7 @@ all,-missing - - 11 + true