Skip to content

Commit 7e98b36

Browse files
authored
Simplify pom.xml by removing JDK 22 profile (#4588)
1 parent c979594 commit 7e98b36

File tree

1 file changed

+1
-55
lines changed

1 file changed

+1
-55
lines changed

pom.xml

Lines changed: 1 addition & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@
404404
<!-- And different set up for JDK 21 -->
405405
<id>java21</id>
406406
<activation>
407-
<jdk>21</jdk>
407+
<jdk>[21,)</jdk>
408408
</activation>
409409
<build>
410410
<plugins>
@@ -453,60 +453,6 @@
453453
</plugins>
454454
</build>
455455
</profile>
456-
<profile>
457-
<!-- And different set up for JDK 22 -->
458-
<id>java22</id>
459-
<activation>
460-
<jdk>22</jdk>
461-
</activation>
462-
<build>
463-
<plugins>
464-
<plugin>
465-
<groupId>org.codehaus.mojo</groupId>
466-
<artifactId>build-helper-maven-plugin</artifactId>
467-
<executions>
468-
<execution>
469-
<id>add-test-source</id>
470-
<phase>generate-test-sources</phase>
471-
<goals>
472-
<goal>add-test-source</goal>
473-
</goals>
474-
<configuration>
475-
<sources>
476-
<source>src/test-jdk11/java</source>
477-
<source>src/test-jdk17/java</source>
478-
<source>src/test-jdk21/java</source>
479-
<source>src/test-jdk22/java</source>
480-
</sources>
481-
</configuration>
482-
</execution>
483-
</executions>
484-
</plugin>
485-
<plugin>
486-
<groupId>org.apache.maven.plugins</groupId>
487-
<artifactId>maven-compiler-plugin</artifactId>
488-
<inherited>true</inherited>
489-
<configuration>
490-
<!-- Enable Java 22 for all sources so that Intellij picks the right language level -->
491-
<source>22</source>
492-
<release>22</release>
493-
<compilerArgs>
494-
<arg>-parameters</arg>
495-
<arg>--add-opens=java.base/java.lang=ALL-UNNAMED</arg>
496-
<arg>--add-opens=java.base/java.util=ALL-UNNAMED</arg>
497-
</compilerArgs>
498-
</configuration>
499-
</plugin>
500-
<plugin>
501-
<groupId>org.apache.maven.plugins</groupId>
502-
<artifactId>maven-surefire-plugin</artifactId>
503-
<configuration>
504-
<argLine>--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED</argLine>
505-
</configuration>
506-
</plugin>
507-
</plugins>
508-
</build>
509-
</profile>
510456
<profile>
511457
<id>errorprone</id>
512458
<build>

0 commit comments

Comments
 (0)