Skip to content

Commit 9f5e14e

Browse files
committed
fix profiles
1 parent 4b97b74 commit 9f5e14e

File tree

1 file changed

+34
-40
lines changed

1 file changed

+34
-40
lines changed

xstream/pom.xml

Lines changed: 34 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,9 @@
258258

259259
<profiles>
260260
<profile>
261-
<id>jdk17</id>
261+
<id>jdk17-ge</id>
262262
<activation>
263-
<jdk>17</jdk>
263+
<jdk>[17,)</jdk>
264264
</activation>
265265
<build>
266266
<plugins>
@@ -274,48 +274,33 @@
274274
<excludePackageNames>com.thoughtworks.xstream.core.util</excludePackageNames>
275275
</configuration>
276276
</plugin>
277-
</plugins>
278-
</build>
279-
</profile>
280-
<profile>
281-
<id>jdk16-ge</id>
282-
<activation>
283-
<jdk>[16,)</jdk>
284-
</activation>
285-
<build>
286-
<plugins>
287277
<plugin>
288278
<groupId>org.apache.maven.plugins</groupId>
289279
<artifactId>maven-compiler-plugin</artifactId>
290-
<configuration>
291-
<testExcludes>
292-
<exclude>**/Record**</exclude>
293-
</testExcludes>
294-
</configuration>
295-
<executions>
296-
<execution>
297-
<id>compile-jdk16</id>
298-
<configuration>
299-
<target>16</target>
300-
<source>16</source>
301-
<testExcludes combine.self="override" />
302-
<testIncludes>
303-
<include>**/Record**</include>
304-
</testIncludes>
305-
</configuration>
306-
<goals>
307-
<goal>testCompile</goal>
308-
</goals>
309-
</execution>
310-
</executions>
311-
</plugin>
280+
<executions>
281+
<execution>
282+
<id>compile-jdk17</id>
283+
<configuration>
284+
<target>17</target>
285+
<source>17</source>
286+
<compilerArgs>
287+
<arg>--enable-preview</arg>
288+
</compilerArgs>
289+
</configuration>
290+
<goals>
291+
<goal>testCompile</goal>
292+
</goals>
293+
</execution>
294+
</executions>
295+
</plugin>
312296
</plugins>
313297
</build>
314298
</profile>
299+
315300
<profile>
316-
<id>jdk15</id>
301+
<id>jdk15-ge</id>
317302
<activation>
318-
<jdk>15</jdk>
303+
<jdk>[15,17)</jdk>
319304
</activation>
320305
<build>
321306
<plugins>
@@ -332,10 +317,7 @@
332317
<id>compile-jdk15</id>
333318
<configuration>
334319
<target>15</target>
335-
<testExcludes combine.self="override" />
336-
<testIncludes>
337-
<include>**/Record**</include>
338-
</testIncludes>
320+
<source>15</source>
339321
<compilerArgs>
340322
<arg>--enable-preview</arg>
341323
</compilerArgs>
@@ -371,6 +353,7 @@
371353
</plugins>
372354
</build>
373355
</profile>
356+
374357
<profile>
375358
<id>jdk11-ge</id>
376359
<activation>
@@ -382,6 +365,8 @@
382365
<groupId>org.apache.maven.plugins</groupId>
383366
<artifactId>maven-compiler-plugin</artifactId>
384367
<configuration>
368+
<target>11</target>
369+
<source>11</source>
385370
<compilerArgs>
386371
<arg>-XDignore.symbol.file</arg>
387372
<arg>--add-exports</arg>
@@ -400,6 +385,15 @@
400385
</dependency>
401386
</dependencies>
402387
</plugin>
388+
<plugin>
389+
<groupId>org.apache.maven.plugins</groupId>
390+
<artifactId>maven-compiler-plugin</artifactId>
391+
<configuration>
392+
<testExcludes>
393+
<exclude>**/Record**</exclude>
394+
</testExcludes>
395+
</configuration>
396+
</plugin>
403397
</plugins>
404398
</build>
405399
</profile>

0 commit comments

Comments
 (0)