Require JDK 17, test on JDK 21 (drop some tests having issues with JDK 17+)

Author: jozic

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         maven: [ '3.8.8', '3.9.9' ]
-        java: [ '11', '17' ]
+        java: [ '17', '21' ]
         os: [ 'ubuntu-latest', 'windows-latest' ]
     runs-on: ${{ matrix.os }}
     steps:

pom.xml

@@ -211,7 +211,7 @@ under the License.
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.13.0</version>
                     <configuration>
-                        <release>11</release>
+                        <release>17</release>
                         <compilerArgs>
                             <arg>-Xlint:all</arg>
                             <arg>-Xlint:-processing</arg>
@@ -272,11 +272,11 @@ under the License.
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <version>3.11.1</version>
                     <configuration>
-                        <source>11</source>
+                        <source>17</source>
                         <detectJavaApiLink>false</detectJavaApiLink>
                         <subpackages>org.scoverage.plugin</subpackages>
                         <links>
-                            <link>https://docs.oracle.com/en/java/javase/11/docs/api/</link>
+                            <link>https://docs.oracle.com/en/java/javase/17/docs/api/</link>
                             <link>https://maven.apache.org/shared-archives/maven-reporting-api-${maven-reporting-api.version}/apidocs/</link>
                             <link>https://maven.apache.org/doxia/components/doxia-archives/doxia-${doxia.version}/apidocs/</link>
                             <link>https://maven.apache.org/ref/${maven.version}/apidocs/</link>
@@ -331,7 +331,7 @@ under the License.
                         <excludes>
                             <exclude>org/scoverage/plugin/HelpMojo.java</exclude>
                         </excludes>
-                        <targetJdk>11</targetJdk>
+                        <targetJdk>17</targetJdk>
                     </configuration>
                 </plugin>
 
@@ -503,8 +503,8 @@ under the License.
                         <configuration>
                             <rules>
                                 <requireJavaVersion>
-                                    <version>11</version>
-                                    <message>Java 11 or later required.</message>
+                                    <version>17</version>
+                                    <message>Java 17 or later required.</message>
                                 </requireJavaVersion>
                             </rules>
                         </configuration>

src/it/test_ScalaMavenPlugin_Scala2_12_JUnit/pom.xml

@@ -19,7 +19,7 @@
 
     <properties>
         <scala.compat.version>2.12</scala.compat.version>
-        <scala.minor.version>8</scala.minor.version> <!-- Testing that 2.12.8 is supported -->
+        <scala.minor.version>20</scala.minor.version>
     </properties>
 
     <build>
@@ -39,9 +39,6 @@
             <plugin>
                 <groupId>@project.groupId@</groupId>
                 <artifactId>@project.artifactId@</artifactId>
-                <configuration>
-                    <scalacPluginVersion>2.0.0</scalacPluginVersion> <!-- Downgrading for Scala 2.12.8 -->
-                </configuration>
             </plugin>
         </plugins>
     </build>

src/it/test_ScalaMavenPlugin_Scala2_12_ScalaTest/pom.xml

@@ -19,7 +19,7 @@
 
     <properties>
         <scala.compat.version>2.12</scala.compat.version>
-        <scala.minor.version>19</scala.minor.version>
+        <scala.minor.version>20</scala.minor.version>
     </properties>
 
     <build>

src/it/test_skip_Scala2_10/invoker.properties

@@ -23,24 +23,33 @@
         <scala.library.artifact.id>scala3-library_3</scala.library.artifact.id>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>net.alchim31.maven</groupId>
-                <artifactId>scala-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.scalatest</groupId>
-                <artifactId>scalatest-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>@project.groupId@</groupId>
-                <artifactId>@project.artifactId@</artifactId>
-            </plugin>
-        </plugins>
-    </build>
+    <profiles>
+        <profile>
+            <id>run</id>
+            <activation>
+                <jdk>17</jdk> <!-- Only run on JDK 17, as Scala 3.1 doesn't support JDK 21 -->
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                    </plugin>
+                    <plugin>
+                        <groupId>net.alchim31.maven</groupId>
+                        <artifactId>scala-maven-plugin</artifactId>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.scalatest</groupId>
+                        <artifactId>scalatest-maven-plugin</artifactId>
+                    </plugin>
+                    <plugin>
+                        <groupId>@project.groupId@</groupId>
+                        <artifactId>@project.artifactId@</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 </project>