[SUREFIRE-2129] Upgrade Maven Reporting API to 3.1.1/Maven Reporting Impl to 3.2.0
This closes #579
diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml
index 40d566d..b48f894 100644
--- a/maven-surefire-report-plugin/pom.xml
+++ b/maven-surefire-report-plugin/pom.xml
@@ -46,6 +46,10 @@
<maven>${mavenVersion}</maven>
</prerequisites>
+ <properties>
+ <doxiaVersion>1.11.1</doxiaVersion>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
@@ -59,6 +63,11 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<scope>provided</scope>
</dependency>
@@ -68,6 +77,20 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-sink-api</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-core</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
</dependency>
diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
index b4d9d24..ee28d08 100644
--- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
@@ -36,7 +36,6 @@
import static org.apache.maven.doxia.sink.SinkEventAttributes.CLASS;
import static org.apache.maven.doxia.sink.SinkEventAttributes.HREF;
import static org.apache.maven.doxia.sink.SinkEventAttributes.ID;
-import static org.apache.maven.doxia.sink.SinkEventAttributes.NAME;
import static org.apache.maven.doxia.sink.SinkEventAttributes.STYLE;
import static org.apache.maven.doxia.sink.SinkEventAttributes.TYPE;
@@ -725,7 +724,7 @@ private static void sinkAnchor( Sink sink, String anchor )
{
// Dollar '$' for nested classes is not valid character in sink.anchor() and therefore it is ignored
// https://issues.apache.org/jira/browse/SUREFIRE-1443
- sink.unknown( A.toString(), TAG_TYPE_START, new SinkEventAttributeSet( NAME, anchor ) );
+ sink.unknown( A.toString(), TAG_TYPE_START, new SinkEventAttributeSet( ID, anchor ) );
sink.unknown( A.toString(), TAG_TYPE_END, null );
}
diff --git a/pom.xml b/pom.xml
index 8d8bdb1..73f7664 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,7 +127,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.1.0</version>
+ <version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -170,7 +170,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven</groupId>
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java
index 27f671b..dbfa5ff 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java
@@ -146,7 +146,7 @@ public static List<ReportTestSuite> extractReports( File... testDirs )
reportsDirs.add( reportsDir );
}
ConsoleLogger logger = new PrintStreamLogger( System.out );
- SurefireReportParser parser = new SurefireReportParser( reportsDirs, Locale.getDefault(), logger );
+ SurefireReportParser parser = new SurefireReportParser( reportsDirs, Locale.ROOT, logger );
try
{
return parser.parseXMLReportFiles();
@@ -167,7 +167,7 @@ private static List<ReportTestSuite> extractITReports( File... testDirs )
reportsDirs.add( reportsDir );
}
ConsoleLogger logger = new PrintStreamLogger( System.out );
- SurefireReportParser parser = new SurefireReportParser( reportsDirs, Locale.getDefault(), logger );
+ SurefireReportParser parser = new SurefireReportParser( reportsDirs, Locale.ROOT, logger );
try
{
return parser.parseXMLReportFiles();
