Skip to content

Commit fd22d7d

Browse files
authored
Merge pull request #403 from WolfgangHG/jbossparent52
jboss-parent 52, redefine minimum java version and checkstyle version
2 parents 0a5ccc3 + e618e57 commit fd22d7d

2 files changed

Lines changed: 11 additions & 27 deletions

File tree

build/ftest-base/pom.xml

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@
332332
Run this profile only in combination with the profile "jakartaee11" so that arquillian-extension-warp is built using the JakartaEE11 api:
333333
mvn clean install -Pjakartaee11,glassfish-jakartaee11-managed
334334
335-
GlassFish 8 does not support Java 17
335+
GlassFish 8 does not support Java 17, but requires Java 21.
336336
-->
337337
<id>glassfish-jakartaee11-managed</id>
338338
<activation>
@@ -342,6 +342,10 @@
342342
</property>
343343
</activation>
344344
<properties>
345+
<!-- Enforce Java 21. Instead of defining a rule for the maven-enforcer plugin ourselves, we can use the plugin definition from jboss-parent
346+
and just have to set this property. -->
347+
<jdk.min.version>21</jdk.min.version>
348+
345349
<arquillian.launch.glassfish>true</arquillian.launch.glassfish>
346350
<arquillian.container.home>${project.build.directory}/glassfish8</arquillian.container.home>
347351
<arquillian.container.distribution>org.glassfish.main.distributions:glassfish:zip:${version.glassfish8}
@@ -352,31 +356,6 @@
352356
</arquillian.container.linux.executepermission.file>
353357
</properties>
354358

355-
<!--This profile requires Java 21 to run, as this is required by GlassFish 8 -->
356-
<build>
357-
<plugins>
358-
<plugin>
359-
<groupId>org.apache.maven.plugins</groupId>
360-
<artifactId>maven-enforcer-plugin</artifactId>
361-
<executions>
362-
<execution>
363-
<id>enforce-java</id>
364-
<goals>
365-
<goal>enforce</goal>
366-
</goals>
367-
<configuration>
368-
<rules>
369-
<requireJavaVersion>
370-
<version>21</version>
371-
</requireJavaVersion>
372-
</rules>
373-
</configuration>
374-
</execution>
375-
</executions>
376-
</plugin>
377-
</plugins>
378-
</build>
379-
380359
<dependencies>
381360
<dependency>
382361
<groupId>ee.omnifish.arquillian</groupId>

pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.jboss</groupId>
77
<artifactId>jboss-parent</artifactId>
8-
<version>51</version>
8+
<version>52</version>
99
</parent>
1010

1111
<!-- Model Version -->
@@ -70,6 +70,11 @@
7070
<properties>
7171
<!-- JBoss Parent -->
7272
<maven.compiler.release>17</maven.compiler.release>
73+
<!-- Also redefine the JDK version for the maven-enforcer-plugin: jboss-parent 52 sets it to "25". -->
74+
<jdk.min.version>${maven.compiler.release}</jdk.min.version>
75+
<!-- jboss-parent 52 uses 13.x of "com.puppycrawl.tools:checkstyle", which requires Java 21. So switch back to the older version.
76+
The dependeny is only defined in jboss-parent, so dependabot should not send updates. -->
77+
<version.checkstyle>12.3.1</version.checkstyle>
7378

7479
<!-- Arquillian -->
7580
<version.arquillian_core>1.10.0.Final</version.arquillian_core>

0 commit comments

Comments
 (0)