Prepare for Doxia 2.0.0

apache · Oct 29, 2023 · 3680527 · 3680527
1 parent 5472d12
commit 3680527
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@ under the License.
   </parent>
 
   <artifactId>maven-invoker-plugin</artifactId>
-  <version>3.6.1-SNAPSHOT</version>
+  <version>3.7.0-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
 
   <name>Apache Maven Invoker Plugin</name>
@@ -150,25 +150,19 @@ under the License.
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-api</artifactId>
-      <version>3.1.1</version>
+      <version>4.0.0-M8</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-impl</artifactId>
-      <version>3.2.0</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-container-default</artifactId>
-        </exclusion>
-      </exclusions>
+      <version>4.0.0-M11</version>
     </dependency>
 
     <!-- doxia -->
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-sink-api</artifactId>
-      <version>1.12.0</version>
+      <version>2.0.0-M8</version>
     </dependency>
 
     <dependency>
@@ -386,9 +380,9 @@ under the License.
         <jarPluginVersion>3.3.0</jarPluginVersion>
         <pluginPluginVersion>3.8.1</pluginPluginVersion>
         <resourcesPluginVersion>3.3.1</resourcesPluginVersion>
-        <sitePluginVersion>3.12.1</sitePluginVersion>
+        <sitePluginVersion>4.0.0-M11</sitePluginVersion>
         <sourcePluginVersion>3.2.1</sourcePluginVersion>
-        <surefirePluginVersion>3.0.0</surefirePluginVersion>
+        <surefirePluginVersion>3.1.2</surefirePluginVersion>
       </properties>
       <build>
         <pluginManagement>

diff --git a/src/it/invoker-report/verify.bsh b/src/it/invoker-report/verify.bsh
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,7 +20,7 @@
 import java.io.*;
 import java.util.*;
 
-File reportFile = new File( basedir, "target/site/invoker-report.html");
+File reportFile = new File( basedir, "target/site/invoker.html");
 
 passed = true;
 

diff --git a/src/main/java/org/apache/maven/plugins/invoker/InvokerReport.java b/src/main/java/org/apache/maven/plugins/invoker/InvokerReport.java
@@ -96,7 +96,7 @@ public String getDescription(Locale locale) {
     }
 
     public String getOutputName() {
-        return "invoker-report";
+        return "invoker";
     }
 
     private File[] getReportFiles() {