Merge pull request #233 from openclover/OC-229-java-21

OC-229: support Java 21 - make project compile-able with Java 21
openclover · Feb 2, 2024 · e024443 · e024443
2 parents b167ef3 + ff8e586
commit e024443
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/clover-idea/pom.xml b/clover-idea/pom.xml
@@ -146,7 +146,9 @@
                                     <not><available file="${testproject.db}" /></not>
                                     <then>
                                         <!-- instrument -->
-                                        <java classname="com.atlassian.clover.CloverInstr" classpath="${org.openclover:clover:jar}">
+                                        <java classname="com.atlassian.clover.CloverInstr"
+                                              classpath="${org.openclover:clover:jar}"
+                                              fork="true">
                                             <arg value="-s" />
                                             <arg value="${testproject.base}" />
                                             <arg value="-d" />
@@ -176,7 +178,9 @@
                                             </batchtest>
                                         </junit>
                                         <!-- generate reports -->
-                                        <java classname="com.atlassian.clover.reporters.html.HtmlReporter" classpath="${org.openclover:clover:jar}" fork="true">
+                                        <java classname="com.atlassian.clover.reporters.html.HtmlReporter"
+                                              classpath="${org.openclover:clover:jar}"
+                                              fork="true">
                                             <arg value="-i" />
                                             <arg value="${testproject.db}" />
                                             <arg value="-o" />
@@ -195,7 +199,7 @@
                     <dependency>
                         <groupId>org.apache.ant</groupId>
                         <artifactId>ant-junit</artifactId>
-                        <version>1.10.13</version>
+                        <version>1.10.14</version>
                     </dependency>
                     <dependency>
                         <groupId>ant-contrib</groupId>

diff --git a/pom.xml b/pom.xml
@@ -224,17 +224,17 @@
             <dependency>
                 <groupId>org.apache.ant</groupId>
                 <artifactId>ant</artifactId>
-                <version>1.10.13</version>
+                <version>1.10.14</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.ant</groupId>
                 <artifactId>ant-junit</artifactId>
-                <version>1.10.13</version>
+                <version>1.10.14</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.ant</groupId>
                 <artifactId>ant-junit4</artifactId>
-                <version>1.10.13</version>
+                <version>1.10.14</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -244,12 +244,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-antrun-plugin</artifactId>
-                    <version>1.8</version>
+                    <version>3.1.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>3.4.2</version>
+                    <version>3.6.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>