Skip to content

Commit

Permalink
Sync local maven tests with Jenkins runs
Browse files Browse the repository at this point in the history 
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
eclipse-jdt#3467
  • Loading branch information
@akurtakov
akurtakov committed Dec 18, 2024
1 parent 15ebb49 commit 07c7cda
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 134 deletions.
25 changes: 2 additions & 23 deletions org.eclipse.jdt.core.tests.builder/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
</plugins>
</build>
<properties>
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,17</tycho.surefire.argLine>
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,11,17</tycho.surefire.argLine>
</properties>
</profile>
<profile>
Expand All @@ -81,28 +81,7 @@
</plugins>
</build>
<properties>
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,21</tycho.surefire.argLine>
</properties>
</profile>
<profile>
<id>test-on-javase-22</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
<configuration>
<toolchains>
<jdk>
<id>JavaSE-22</id>
</jdk>
</toolchains>
</configuration>
</plugin>
</plugins>
</build>
<properties>
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,21,22</tycho.surefire.argLine>
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,11,17,21</tycho.surefire.argLine>
</properties>
</profile>
</profiles>
Expand Down
69 changes: 3 additions & 66 deletions org.eclipse.jdt.core.tests.compiler/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,70 +62,7 @@
</plugins>
</build>
<properties>
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,14,17</tycho.surefire.argLine>
</properties>
</profile>
<profile>
<id>test-on-javase-18</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
<configuration>
<toolchains>
<jdk>
<id>JavaSE-18</id>
</jdk>
</toolchains>
</configuration>
</plugin>
</plugins>
</build>
<properties>
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,15,18</tycho.surefire.argLine>
</properties>
</profile>
<profile>
<id>test-on-javase-19</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
<configuration>
<toolchains>
<jdk>
<id>JavaSE-19</id>
</jdk>
</toolchains>
</configuration>
</plugin>
</plugins>
</build>
<properties>
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,17,19</tycho.surefire.argLine>
</properties>
</profile>
<profile>
<id>test-on-javase-20</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
<configuration>
<toolchains>
<jdk>
<id>JavaSE-20</id>
</jdk>
</toolchains>
</configuration>
</plugin>
</plugins>
</build>
<properties>
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,17,20</tycho.surefire.argLine>
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,11,17</tycho.surefire.argLine>
</properties>
</profile>
<profile>
Expand All @@ -146,7 +83,7 @@
</plugins>
</build>
<properties>
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,17,19,21</tycho.surefire.argLine>
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,11,17,21</tycho.surefire.argLine>
</properties>
</profile>
<profile>
Expand All @@ -167,7 +104,7 @@
</plugins>
</build>
<properties>
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,17,21,23</tycho.surefire.argLine>
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,11,17,21,23</tycho.surefire.argLine>
</properties>
</profile>
</profiles>
Expand Down
48 changes: 3 additions & 45 deletions org.eclipse.jdt.core.tests.model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,49 +90,7 @@
</plugins>
</build>
<properties>
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,14,17</tycho.surefire.argLine>
</properties>
</profile>
<profile>
<id>test-on-javase-18</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
<configuration>
<toolchains>
<jdk>
<id>JavaSE-18</id>
</jdk>
</toolchains>
</configuration>
</plugin>
</plugins>
</build>
<properties>
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,15,18</tycho.surefire.argLine>
</properties>
</profile>
<profile>
<id>test-on-javase-19</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
<configuration>
<toolchains>
<jdk>
<id>JavaSE-19</id>
</jdk>
</toolchains>
</configuration>
</plugin>
</plugins>
</build>
<properties>
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,17,19</tycho.surefire.argLine>
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,11,17</tycho.surefire.argLine>
</properties>
</profile>
<profile>
Expand All @@ -153,7 +111,7 @@
</plugins>
</build>
<properties>
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,17,19,21</tycho.surefire.argLine>
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,11,17,21</tycho.surefire.argLine>
</properties>
</profile>
<profile>
Expand All @@ -174,7 +132,7 @@
</plugins>
</build>
<properties>
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,17,21,23</tycho.surefire.argLine>
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,11,17,21,23</tycho.surefire.argLine>
</properties>
</profile>
</profiles>
Expand Down

0 comments on commit 07c7cda

Please sign in to comment.