From 07c7cda1fd6d5b50284e79a168ad57ad57015f5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Wed, 18 Dec 2024 13:58:45 +0200 Subject: [PATCH] Sync local maven tests with Jenkins runs For jenkins runs compliance is set to -Dcompliance=1.8,11,17,21,23. This PR makes pure maven builds do the same with the difference that older JVMs can run tests for Java LTS versions equal or older than running JVM. Continuation of https://github.com/eclipse-jdt/eclipse.jdt.core/pull/3467 --- org.eclipse.jdt.core.tests.builder/pom.xml | 25 +------- org.eclipse.jdt.core.tests.compiler/pom.xml | 69 +-------------------- org.eclipse.jdt.core.tests.model/pom.xml | 48 +------------- 3 files changed, 8 insertions(+), 134 deletions(-) diff --git a/org.eclipse.jdt.core.tests.builder/pom.xml b/org.eclipse.jdt.core.tests.builder/pom.xml index 836ca2e2698..dcf9c7a12eb 100644 --- a/org.eclipse.jdt.core.tests.builder/pom.xml +++ b/org.eclipse.jdt.core.tests.builder/pom.xml @@ -60,7 +60,7 @@ - --add-modules ALL-SYSTEM -Dcompliance=1.8,17 + --add-modules ALL-SYSTEM -Dcompliance=1.8,11,17 @@ -81,28 +81,7 @@ - --add-modules ALL-SYSTEM -Dcompliance=1.8,21 - - - - test-on-javase-22 - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - JavaSE-22 - - - - - - - - --add-modules ALL-SYSTEM -Dcompliance=1.8,21,22 + --add-modules ALL-SYSTEM -Dcompliance=1.8,11,17,21 diff --git a/org.eclipse.jdt.core.tests.compiler/pom.xml b/org.eclipse.jdt.core.tests.compiler/pom.xml index 013578f373d..92c2549a64f 100644 --- a/org.eclipse.jdt.core.tests.compiler/pom.xml +++ b/org.eclipse.jdt.core.tests.compiler/pom.xml @@ -62,70 +62,7 @@ - --add-modules ALL-SYSTEM -Dcompliance=1.8,14,17 - - - - test-on-javase-18 - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - JavaSE-18 - - - - - - - - --add-modules ALL-SYSTEM -Dcompliance=1.8,15,18 - - - - test-on-javase-19 - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - JavaSE-19 - - - - - - - - --add-modules ALL-SYSTEM -Dcompliance=1.8,17,19 - - - - test-on-javase-20 - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - JavaSE-20 - - - - - - - - --add-modules ALL-SYSTEM -Dcompliance=1.8,17,20 + --add-modules ALL-SYSTEM -Dcompliance=1.8,11,17 @@ -146,7 +83,7 @@ - --add-modules ALL-SYSTEM -Dcompliance=1.8,17,19,21 + --add-modules ALL-SYSTEM -Dcompliance=1.8,11,17,21 @@ -167,7 +104,7 @@ - --add-modules ALL-SYSTEM -Dcompliance=1.8,17,21,23 + --add-modules ALL-SYSTEM -Dcompliance=1.8,11,17,21,23 diff --git a/org.eclipse.jdt.core.tests.model/pom.xml b/org.eclipse.jdt.core.tests.model/pom.xml index 78e039bdf6a..61ec6c2a7a7 100644 --- a/org.eclipse.jdt.core.tests.model/pom.xml +++ b/org.eclipse.jdt.core.tests.model/pom.xml @@ -90,49 +90,7 @@ - --add-modules ALL-SYSTEM -Dcompliance=1.8,14,17 - - - - test-on-javase-18 - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - JavaSE-18 - - - - - - - - --add-modules ALL-SYSTEM -Dcompliance=1.8,15,18 - - - - test-on-javase-19 - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - JavaSE-19 - - - - - - - - --add-modules ALL-SYSTEM -Dcompliance=1.8,17,19 + --add-modules ALL-SYSTEM -Dcompliance=1.8,11,17 @@ -153,7 +111,7 @@ - --add-modules ALL-SYSTEM -Dcompliance=1.8,17,19,21 + --add-modules ALL-SYSTEM -Dcompliance=1.8,11,17,21 @@ -174,7 +132,7 @@ - --add-modules ALL-SYSTEM -Dcompliance=1.8,17,21,23 + --add-modules ALL-SYSTEM -Dcompliance=1.8,11,17,21,23