Skip to content

Commit 8f39d41

Browse files
committed
Require JDK 17, test on JDK 21 (drop some tests having issues with JDK 17+)
1 parent c652406 commit 8f39d41

File tree

20 files changed

+38
-270
lines changed

20 files changed

+38
-270
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
matrix:
1515
maven: [ '3.8.8', '3.9.9' ]
16-
java: [ '11', '17' ]
16+
java: [ '17', '21' ]
1717
os: [ 'ubuntu-latest', 'windows-latest' ]
1818
runs-on: ${{ matrix.os }}
1919
steps:

pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ under the License.
211211
<artifactId>maven-compiler-plugin</artifactId>
212212
<version>3.13.0</version>
213213
<configuration>
214-
<release>11</release>
214+
<release>17</release>
215215
<compilerArgs>
216216
<arg>-Xlint:all</arg>
217217
<arg>-Xlint:-processing</arg>
@@ -272,11 +272,11 @@ under the License.
272272
<artifactId>maven-javadoc-plugin</artifactId>
273273
<version>3.11.1</version>
274274
<configuration>
275-
<source>11</source>
275+
<source>17</source>
276276
<detectJavaApiLink>false</detectJavaApiLink>
277277
<subpackages>org.scoverage.plugin</subpackages>
278278
<links>
279-
<link>https://docs.oracle.com/en/java/javase/11/docs/api/</link>
279+
<link>https://docs.oracle.com/en/java/javase/17/docs/api/</link>
280280
<link>https://maven.apache.org/shared-archives/maven-reporting-api-${maven-reporting-api.version}/apidocs/</link>
281281
<link>https://maven.apache.org/doxia/components/doxia-archives/doxia-${doxia.version}/apidocs/</link>
282282
<link>https://maven.apache.org/ref/${maven.version}/apidocs/</link>
@@ -331,7 +331,7 @@ under the License.
331331
<excludes>
332332
<exclude>org/scoverage/plugin/HelpMojo.java</exclude>
333333
</excludes>
334-
<targetJdk>11</targetJdk>
334+
<targetJdk>17</targetJdk>
335335
</configuration>
336336
</plugin>
337337

@@ -503,8 +503,8 @@ under the License.
503503
<configuration>
504504
<rules>
505505
<requireJavaVersion>
506-
<version>11</version>
507-
<message>Java 11 or later required.</message>
506+
<version>17</version>
507+
<message>Java 17 or later required.</message>
508508
</requireJavaVersion>
509509
</rules>
510510
</configuration>

src/it/test_ScalaMavenPlugin_Scala2_12_JUnit/pom.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<properties>
2121
<scala.compat.version>2.12</scala.compat.version>
22-
<scala.minor.version>8</scala.minor.version> <!-- Testing that 2.12.8 is supported -->
22+
<scala.minor.version>20</scala.minor.version>
2323
</properties>
2424

2525
<build>
@@ -39,9 +39,6 @@
3939
<plugin>
4040
<groupId>@project.groupId@</groupId>
4141
<artifactId>@project.artifactId@</artifactId>
42-
<configuration>
43-
<scalacPluginVersion>2.0.0</scalacPluginVersion> <!-- Downgrading for Scala 2.12.8 -->
44-
</configuration>
4542
</plugin>
4643
</plugins>
4744
</build>

src/it/test_ScalaMavenPlugin_Scala2_12_ScalaTest/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<properties>
2121
<scala.compat.version>2.12</scala.compat.version>
22-
<scala.minor.version>19</scala.minor.version>
22+
<scala.minor.version>20</scala.minor.version>
2323
</properties>
2424

2525
<build>

src/it/test_skip_Scala2_10/invoker.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/it/test_skip_Scala2_10/pom.xml

Lines changed: 0 additions & 45 deletions
This file was deleted.

src/it/test_skip_Scala2_10/src/main/scala/HelloServiceScala.scala

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/it/test_skip_Scala2_10/src/test/scala/HelloServiceScalaTest.scala

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/it/test_skip_Scala2_10/validate.groovy

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/it/test_skip_Scala2_11/invoker.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/it/test_skip_Scala2_11/pom.xml

Lines changed: 0 additions & 45 deletions
This file was deleted.

src/it/test_skip_Scala2_11/src/main/scala/HelloServiceScala.scala

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/it/test_skip_Scala2_11/src/test/scala/HelloServiceScalaTest.scala

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/it/test_skip_Scala2_11/validate.groovy

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/it/test_skip_Scala2_12_7/invoker.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/it/test_skip_Scala2_12_7/pom.xml

Lines changed: 0 additions & 55 deletions
This file was deleted.

src/it/test_skip_Scala2_12_7/src/main/scala/HelloServiceScala.scala

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/it/test_skip_Scala2_12_7/src/test/scala/HelloServiceScalaTest.scala

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/it/test_skip_Scala2_12_7/validate.groovy

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/it/test_skip_Scala3_1/pom.xml

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,33 @@
2323
<scala.library.artifact.id>scala3-library_3</scala.library.artifact.id>
2424
</properties>
2525

26-
<build>
27-
<plugins>
28-
<plugin>
29-
<groupId>org.apache.maven.plugins</groupId>
30-
<artifactId>maven-compiler-plugin</artifactId>
31-
</plugin>
32-
<plugin>
33-
<groupId>net.alchim31.maven</groupId>
34-
<artifactId>scala-maven-plugin</artifactId>
35-
</plugin>
36-
<plugin>
37-
<groupId>org.scalatest</groupId>
38-
<artifactId>scalatest-maven-plugin</artifactId>
39-
</plugin>
40-
<plugin>
41-
<groupId>@project.groupId@</groupId>
42-
<artifactId>@project.artifactId@</artifactId>
43-
</plugin>
44-
</plugins>
45-
</build>
26+
<profiles>
27+
<profile>
28+
<id>run</id>
29+
<activation>
30+
<jdk>17</jdk> <!-- Only run on JDK 17, as Scala 3.1 doesn't support JDK 21 -->
31+
</activation>
32+
<build>
33+
<plugins>
34+
<plugin>
35+
<groupId>org.apache.maven.plugins</groupId>
36+
<artifactId>maven-compiler-plugin</artifactId>
37+
</plugin>
38+
<plugin>
39+
<groupId>net.alchim31.maven</groupId>
40+
<artifactId>scala-maven-plugin</artifactId>
41+
</plugin>
42+
<plugin>
43+
<groupId>org.scalatest</groupId>
44+
<artifactId>scalatest-maven-plugin</artifactId>
45+
</plugin>
46+
<plugin>
47+
<groupId>@project.groupId@</groupId>
48+
<artifactId>@project.artifactId@</artifactId>
49+
</plugin>
50+
</plugins>
51+
</build>
52+
</profile>
53+
</profiles>
54+
4655
</project>

0 commit comments

Comments
 (0)