Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[MINVOKER-354] Upgrade to Doxia 2.0.0 Milestone Stack #187

Merged
merged 2 commits into from
Aug 18, 2024
Merged

[MINVOKER-354] Upgrade to Doxia 2.0.0 Milestone Stack #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36bcf12
[MINVOKER-354] Upgrade to Doxia 2.0.0 Milestone Stack
michael-o Feb 19, 2023
843ddcf
[MINVOKER-346] Align report output name
michael-o Jan 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 10 additions & 29 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ under the License.
<properties>
<javaVersion>8</javaVersion>
<mavenVersion>3.6.3</mavenVersion>
<resolverVersion>1.4.1</resolverVersion>
<beanshell-groupId>org.apache-extras.beanshell</beanshell-groupId>
<beanshell-artifactId>bsh</beanshell-artifactId>
<beanshell-version>2.0b6</beanshell-version>
Expand Down Expand Up @@ -148,56 +149,32 @@ under the License.
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-api</artifactId>
<version>1.4.1</version>
<version>${resolverVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-util</artifactId>
<version>1.4.1</version>
<version>${resolverVersion}</version>
</dependency>

<!-- shared -->
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
<version>3.1.1</version>
<version>4.0.0-M12</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>
<exclusion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
</exclusion>
</exclusions>
<version>4.0.0-M15</version>
</dependency>

<!-- doxia -->
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-sink-api</artifactId>
<version>1.12.0</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
<version>2.0.0-M12</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -412,6 +389,10 @@ under the License.
<profiles>
<profile>
<id>run-its</id>
<properties>
<!-- plugins versions used in IT tests -->
<version.maven-site-plugin>3.20.0</version.maven-site-plugin>
</properties>
<build>
<pluginManagement>
<plugins>
Expand Down
2 changes: 1 addition & 1 deletion src/it/invoker-report/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/apache/maven/plugins/invoker/InvokerReport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public String getDescription(Locale locale) {
}

public String getOutputName() {
return "invoker-report";
return "invoker";
}

private File[] getReportFiles() {
Expand Down