Merge pull request #46 from MarkEWaite/test-with-java-21

Require Java 11 and Jenkins 2.387.3 or newer, test with Java 21

.github/workflows/A-test-master.yml

@@ -1,4 +1,4 @@
-name: A quick test on JDK8
+name: A Test master on JDK 17
 
 on:
   push:
@@ -13,10 +13,10 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Set up JDK 1.8
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: 8.0
+        java-version: 17.0
         distribution: temurin
         cache: maven
 

CHANGELOG.md

@@ -5,6 +5,9 @@
 - Upgrade to OpenClover 4.5.0 feature release. This version brings support for annotations on java types
   and experimental support for Java 10-17. See the [OpenClover 4.5.0 release notes](http://openclover.org/doc/openclover-4.5.0-release-notes.html)
   for more details.
+- Require Java 11 or Java 17.
+  Refer to the [blog post](https://www.jenkins.io/blog/2022/06/28/require-java-11/) for more details about Java 11 and Java 17 support.
+- Require Jenkins 2.387.3 or newer.
 
 ## Version 4.13.0 (March 3, 2022)
 

Jenkinsfile

@@ -1 +1,11 @@
-buildPlugin()
+/*
+ See the documentation for more options:
+ https://github.com/jenkins-infra/pipeline-library/
+*/
+buildPlugin(
+  forkCount: '1C', // Run 1 test process per core
+  useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests
+  configurations: [
+    [platform: 'linux', jdk: 21],
+    [platform: 'windows', jdk: 17],
+])

pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.33</version>
+        <version>4.74</version>
     </parent>
     <artifactId>clover</artifactId>
     <packaging>hpi</packaging>
@@ -34,17 +34,16 @@
         <changelist>999999-SNAPSHOT</changelist>
         <gitHubRepo>jenkinsci/clover-plugin</gitHubRepo>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.level>8</java.level>
-        <jenkins.version>2.289.3</jenkins.version>
+        <jenkins.version>2.387.3</jenkins.version>
         <clover.version>4.5.0</clover.version>
     </properties>
 
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.289.x</artifactId>
-                <version>1500.ve4d05cd32975</version>
+                <artifactId>bom-2.387.x</artifactId>
+                <version>2483.v3b_22f030990a_</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -78,15 +77,6 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <forkCount>1C</forkCount>
-                    <reuseForks>true</reuseForks>
-                </configuration>
-            </plugin>
-        </plugins>
     </build>
     <profiles>
         <profile>

src/test/java/hudson/plugins/clover/CloverBuildActionTest.java

@@ -15,7 +15,7 @@
 
 import java.util.concurrent.TimeUnit;
 
-import static com.gargoylesoftware.htmlunit.WebAssert.assertTextPresent;
+import static org.htmlunit.WebAssert.assertTextPresent;
 import static org.junit.Assert.assertNotNull;
 
 public class CloverBuildActionTest {