Merge pull request #1263 from hcoles/feature/update_test_matrix

test against java 21
hcoles · Oct 12, 2023 · 69a181f · 69a181f
2 parents 638dbce + 1740532
commit 69a181f
Show file tree

Hide file tree

Showing 30 changed files with 66 additions and 55 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,8 +20,8 @@ jobs:
             java: 11
           - title: "JDK 18"
             java: "18"
-          - title: "JDK 19"
-            java: "19"
+          - title: "JDK 21"
+            java: "21"
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout from Git'

diff --git a/pitest-entry/src/main/java/org/pitest/bytecode/analysis/ClassTree.java b/pitest-entry/src/main/java/org/pitest/bytecode/analysis/ClassTree.java
@@ -12,6 +12,7 @@
 import java.util.stream.Stream;
 
 import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.AnnotationNode;
 import org.objectweb.asm.tree.ClassNode;
@@ -41,6 +42,12 @@ public static ClassTree fromBytes(byte[] bytes) {
     return new ClassTree(classNode);
   }
 
+  public byte[] toBytes() {
+    ClassWriter classWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
+    rawNode().accept(classWriter);
+    return classWriter.toByteArray();
+  }
+
   public List<MethodTree> methods() {
     if (this.lazyMethods != null) {
       return this.lazyMethods;

diff --git a/pitest-groovy-verification/pom.xml b/pitest-groovy-verification/pom.xml
@@ -30,8 +30,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
 					<compilerId>groovy-eclipse-compiler</compilerId>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 					<includes>
 						<include>**/*.groovy</include>
 						<include>**/*.java</include>

diff --git a/pitest-maven-verification/src/test/resources/pit-158-coverage/pom.xml b/pitest-maven-verification/src/test/resources/pit-158-coverage/pom.xml
@@ -33,8 +33,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.4</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 			<plugin>

diff --git a/pitest-maven-verification/src/test/resources/pit-183-gwtmockito/pom.xml b/pitest-maven-verification/src/test/resources/pit-183-gwtmockito/pom.xml
@@ -16,8 +16,8 @@
               <artifactId>maven-compiler-plugin</artifactId>
               <version>2.4</version>
               <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/pitest-maven-verification/src/test/resources/pit-263-yatspec/pom.xml b/pitest-maven-verification/src/test/resources/pit-263-yatspec/pom.xml
@@ -13,8 +13,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/...ven-verification/src/test/resources/pit-33-setUserDir/pit-33-setUserDir-subModule/pom.xml b/...ven-verification/src/test/resources/pit-33-setUserDir/pit-33-setUserDir-subModule/pom.xml
@@ -24,8 +24,8 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 			<plugin>

diff --git a/pitest-maven-verification/src/test/resources/pit-33-setUserDir/pom.xml b/pitest-maven-verification/src/test/resources/pit-33-setUserDir/pom.xml
@@ -20,8 +20,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.4</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 			<plugin>

diff --git a/pitest-maven-verification/src/test/resources/pit-deterministic-coverage/pom.xml b/pitest-maven-verification/src/test/resources/pit-deterministic-coverage/pom.xml
@@ -20,8 +20,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.4</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 			<plugin>

diff --git a/pitest-maven-verification/src/test/resources/pit-enum-constructor-npe/pom.xml b/pitest-maven-verification/src/test/resources/pit-enum-constructor-npe/pom.xml
@@ -28,8 +28,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.4</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/pitest-maven-verification/src/test/resources/pit-findOccupiedTestPackages/pom.xml b/pitest-maven-verification/src/test/resources/pit-findOccupiedTestPackages/pom.xml
@@ -27,8 +27,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.4</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 			<plugin>

diff --git a/pitest-maven-verification/src/test/resources/pit-jacoco/pom.xml b/pitest-maven-verification/src/test/resources/pit-jacoco/pom.xml
@@ -28,8 +28,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.4</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/pitest-maven-verification/src/test/resources/pit-junit-categories/pom.xml b/pitest-maven-verification/src/test/resources/pit-junit-categories/pom.xml
@@ -21,8 +21,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.4</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 			<plugin>

diff --git a/pitest-maven-verification/src/test/resources/pit-kotlin-multi-module/pom.xml b/pitest-maven-verification/src/test/resources/pit-kotlin-multi-module/pom.xml
@@ -20,8 +20,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.4</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
 

diff --git a/pitest-maven-verification/src/test/resources/pit-missing-test-plugin/pom.xml b/pitest-maven-verification/src/test/resources/pit-missing-test-plugin/pom.xml
@@ -20,6 +20,10 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.10.1</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.pitest</groupId>

diff --git a/pitest-maven-verification/src/test/resources/pit-powermock/pom.xml b/pitest-maven-verification/src/test/resources/pit-powermock/pom.xml
@@ -45,8 +45,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.4</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 			<plugin>

diff --git a/pitest-maven-verification/src/test/resources/pit-process-hang/pom.xml b/pitest-maven-verification/src/test/resources/pit-process-hang/pom.xml
@@ -28,8 +28,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.4</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 			<plugin>

diff --git a/pitest-maven-verification/src/test/resources/pit-site-combined/pom.xml b/pitest-maven-verification/src/test/resources/pit-site-combined/pom.xml
@@ -23,8 +23,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.4</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 		</plugins>

diff --git a/pitest-maven-verification/src/test/resources/pit-site-custom-config/pom.xml b/pitest-maven-verification/src/test/resources/pit-site-custom-config/pom.xml
@@ -23,8 +23,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.4</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/pitest-maven-verification/src/test/resources/pit-site-multiple-timestamped/pom.xml b/pitest-maven-verification/src/test/resources/pit-site-multiple-timestamped/pom.xml
@@ -23,8 +23,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.4</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 		</plugins>

diff --git a/pitest-maven-verification/src/test/resources/pit-site-non-timestamped/pom.xml b/pitest-maven-verification/src/test/resources/pit-site-non-timestamped/pom.xml
@@ -23,8 +23,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.4</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 		</plugins>

diff --git a/pitest-maven-verification/src/test/resources/pit-site-reportonly/pom.xml b/pitest-maven-verification/src/test/resources/pit-site-reportonly/pom.xml
@@ -30,8 +30,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.4</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 		</plugins>

diff --git a/pitest-maven-verification/src/test/resources/pit-site-skip/pom.xml b/pitest-maven-verification/src/test/resources/pit-site-skip/pom.xml
@@ -23,8 +23,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.4</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 		</plugins>

diff --git a/pitest-maven-verification/src/test/resources/pit-site-timestamped/pom.xml b/pitest-maven-verification/src/test/resources/pit-site-timestamped/pom.xml
@@ -23,8 +23,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.4</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 		</plugins>

diff --git a/pitest-maven-verification/src/test/resources/pit-skipTests-active/pom.xml b/pitest-maven-verification/src/test/resources/pit-skipTests-active/pom.xml
@@ -21,8 +21,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.4</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 			<plugin>

diff --git a/pitest-maven-verification/src/test/resources/pit-sub-module/pom.xml b/pitest-maven-verification/src/test/resources/pit-sub-module/pom.xml
@@ -20,8 +20,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.4</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 

diff --git a/pitest-maven-verification/src/test/resources/pit-sub-module/sub-module-1/pom.xml b/pitest-maven-verification/src/test/resources/pit-sub-module/sub-module-1/pom.xml
@@ -24,8 +24,8 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 

diff --git a/pitest-maven-verification/src/test/resources/pit-sub-module/sub-module-2/pom.xml b/pitest-maven-verification/src/test/resources/pit-sub-module/sub-module-2/pom.xml
@@ -24,8 +24,8 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 

diff --git a/pitest-maven-verification/src/test/resources/pit-surefire-excludes/pom.xml b/pitest-maven-verification/src/test/resources/pit-surefire-excludes/pom.xml
@@ -21,8 +21,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.4</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 		       <plugin>

diff --git a/pom.xml b/pom.xml
@@ -172,7 +172,7 @@
 			<dependency>
 				<groupId>nl.jqno.equalsverifier</groupId>
 				<artifactId>equalsverifier</artifactId>
-				<version>3.10.1</version>
+				<version>3.15.2</version>
 				<scope>test</scope>
 			</dependency>
 		</dependencies>