Skip to content

Commit 07c7cda

Browse files
akurtakovakurtakov
committed
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 #3467
1 parent 15ebb49 commit 07c7cda

File tree

3 files changed

+8
-134
lines changed
  • org.eclipse.jdt.core.tests.builder
  • org.eclipse.jdt.core.tests.compiler
  • org.eclipse.jdt.core.tests.model

3 files changed

+8
-134
lines changed

‎org.eclipse.jdt.core.tests.builder/pom.xml‎

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
</plugins>
6161
</build>
6262
<properties>
63-
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,17</tycho.surefire.argLine>
63+
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,11,17</tycho.surefire.argLine>
6464
</properties>
6565
</profile>
6666
<profile>
@@ -81,28 +81,7 @@
8181
</plugins>
8282
</build>
8383
<properties>
84-
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,21</tycho.surefire.argLine>
85-
</properties>
86-
</profile>
87-
<profile>
88-
<id>test-on-javase-22</id>
89-
<build>
90-
<plugins>
91-
<plugin>
92-
<groupId>org.apache.maven.plugins</groupId>
93-
<artifactId>maven-toolchains-plugin</artifactId>
94-
<configuration>
95-
<toolchains>
96-
<jdk>
97-
<id>JavaSE-22</id>
98-
</jdk>
99-
</toolchains>
100-
</configuration>
101-
</plugin>
102-
</plugins>
103-
</build>
104-
<properties>
105-
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,21,22</tycho.surefire.argLine>
84+
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,11,17,21</tycho.surefire.argLine>
10685
</properties>
10786
</profile>
10887
</profiles>

‎org.eclipse.jdt.core.tests.compiler/pom.xml‎

Lines changed: 3 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -62,70 +62,7 @@
6262
</plugins>
6363
</build>
6464
<properties>
65-
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,14,17</tycho.surefire.argLine>
66-
</properties>
67-
</profile>
68-
<profile>
69-
<id>test-on-javase-18</id>
70-
<build>
71-
<plugins>
72-
<plugin>
73-
<groupId>org.apache.maven.plugins</groupId>
74-
<artifactId>maven-toolchains-plugin</artifactId>
75-
<configuration>
76-
<toolchains>
77-
<jdk>
78-
<id>JavaSE-18</id>
79-
</jdk>
80-
</toolchains>
81-
</configuration>
82-
</plugin>
83-
</plugins>
84-
</build>
85-
<properties>
86-
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,15,18</tycho.surefire.argLine>
87-
</properties>
88-
</profile>
89-
<profile>
90-
<id>test-on-javase-19</id>
91-
<build>
92-
<plugins>
93-
<plugin>
94-
<groupId>org.apache.maven.plugins</groupId>
95-
<artifactId>maven-toolchains-plugin</artifactId>
96-
<configuration>
97-
<toolchains>
98-
<jdk>
99-
<id>JavaSE-19</id>
100-
</jdk>
101-
</toolchains>
102-
</configuration>
103-
</plugin>
104-
</plugins>
105-
</build>
106-
<properties>
107-
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,17,19</tycho.surefire.argLine>
108-
</properties>
109-
</profile>
110-
<profile>
111-
<id>test-on-javase-20</id>
112-
<build>
113-
<plugins>
114-
<plugin>
115-
<groupId>org.apache.maven.plugins</groupId>
116-
<artifactId>maven-toolchains-plugin</artifactId>
117-
<configuration>
118-
<toolchains>
119-
<jdk>
120-
<id>JavaSE-20</id>
121-
</jdk>
122-
</toolchains>
123-
</configuration>
124-
</plugin>
125-
</plugins>
126-
</build>
127-
<properties>
128-
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,17,20</tycho.surefire.argLine>
65+
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,11,17</tycho.surefire.argLine>
12966
</properties>
13067
</profile>
13168
<profile>
@@ -146,7 +83,7 @@
14683
</plugins>
14784
</build>
14885
<properties>
149-
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,17,19,21</tycho.surefire.argLine>
86+
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,11,17,21</tycho.surefire.argLine>
15087
</properties>
15188
</profile>
15289
<profile>
@@ -167,7 +104,7 @@
167104
</plugins>
168105
</build>
169106
<properties>
170-
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,17,21,23</tycho.surefire.argLine>
107+
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,11,17,21,23</tycho.surefire.argLine>
171108
</properties>
172109
</profile>
173110
</profiles>

‎org.eclipse.jdt.core.tests.model/pom.xml‎

Lines changed: 3 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -90,49 +90,7 @@
9090
</plugins>
9191
</build>
9292
<properties>
93-
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,14,17</tycho.surefire.argLine>
94-
</properties>
95-
</profile>
96-
<profile>
97-
<id>test-on-javase-18</id>
98-
<build>
99-
<plugins>
100-
<plugin>
101-
<groupId>org.apache.maven.plugins</groupId>
102-
<artifactId>maven-toolchains-plugin</artifactId>
103-
<configuration>
104-
<toolchains>
105-
<jdk>
106-
<id>JavaSE-18</id>
107-
</jdk>
108-
</toolchains>
109-
</configuration>
110-
</plugin>
111-
</plugins>
112-
</build>
113-
<properties>
114-
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,15,18</tycho.surefire.argLine>
115-
</properties>
116-
</profile>
117-
<profile>
118-
<id>test-on-javase-19</id>
119-
<build>
120-
<plugins>
121-
<plugin>
122-
<groupId>org.apache.maven.plugins</groupId>
123-
<artifactId>maven-toolchains-plugin</artifactId>
124-
<configuration>
125-
<toolchains>
126-
<jdk>
127-
<id>JavaSE-19</id>
128-
</jdk>
129-
</toolchains>
130-
</configuration>
131-
</plugin>
132-
</plugins>
133-
</build>
134-
<properties>
135-
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,17,19</tycho.surefire.argLine>
93+
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,11,17</tycho.surefire.argLine>
13694
</properties>
13795
</profile>
13896
<profile>
@@ -153,7 +111,7 @@
153111
</plugins>
154112
</build>
155113
<properties>
156-
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,17,19,21</tycho.surefire.argLine>
114+
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,11,17,21</tycho.surefire.argLine>
157115
</properties>
158116
</profile>
159117
<profile>
@@ -174,7 +132,7 @@
174132
</plugins>
175133
</build>
176134
<properties>
177-
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,17,21,23</tycho.surefire.argLine>
135+
<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,11,17,21,23</tycho.surefire.argLine>
178136
</properties>
179137
</profile>
180138
</profiles>

0 commit comments

Comments
 (0)