|
 |
2cffaf |
From 2ba046249b2d31d91949aafba8561b8412c0434b Mon Sep 17 00:00:00 2001
|
|
|
2cffaf |
From: Michael Simacek <msimacek@redhat.com>
|
|
|
2cffaf |
Date: Thu, 5 May 2016 11:19:09 +0200
|
|
|
2cffaf |
Subject: [PATCH 2/2] Fix test with doxia-1.7
|
|
|
2cffaf |
|
|
|
2cffaf |
---
|
|
|
2cffaf |
maven-surefire-report-plugin/pom.xml | 9 +++++++--
|
|
|
2cffaf |
.../maven/plugins/surefire/report/SurefireReportGenerator.java | 2 +-
|
|
|
2cffaf |
2 files changed, 8 insertions(+), 3 deletions(-)
|
|
|
2cffaf |
|
|
|
2cffaf |
diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml
|
|
|
2cffaf |
index e7c48a7..880e211 100644
|
|
|
2cffaf |
--- a/maven-surefire-report-plugin/pom.xml
|
|
|
2cffaf |
+++ b/maven-surefire-report-plugin/pom.xml
|
|
|
2cffaf |
@@ -86,12 +86,17 @@
|
|
|
2cffaf |
<dependency>
|
|
|
2cffaf |
<groupId>org.apache.maven.doxia</groupId>
|
|
|
2cffaf |
<artifactId>doxia-sink-api</artifactId>
|
|
|
2cffaf |
- <version>1.6</version>
|
|
|
2cffaf |
+ <version>1.7</version>
|
|
|
2cffaf |
</dependency>
|
|
|
2cffaf |
<dependency>
|
|
|
2cffaf |
<groupId>org.apache.maven.doxia</groupId>
|
|
|
2cffaf |
<artifactId>doxia-site-renderer</artifactId>
|
|
|
2cffaf |
- <version>1.6</version>
|
|
|
2cffaf |
+ <version>1.7</version>
|
|
|
2cffaf |
+ </dependency>
|
|
|
2cffaf |
+ <dependency>
|
|
|
2cffaf |
+ <groupId>org.apache.maven.doxia</groupId>
|
|
|
2cffaf |
+ <artifactId>doxia-core</artifactId>
|
|
|
2cffaf |
+ <version>1.7</version>
|
|
|
2cffaf |
</dependency>
|
|
|
2cffaf |
<dependency>
|
|
|
2cffaf |
<groupId>org.codehaus.plexus</groupId>
|
|
|
2cffaf |
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
|
|
|
2cffaf |
index a6e49cd..f62fd69 100644
|
|
|
2cffaf |
--- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
|
|
|
2cffaf |
+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
|
|
|
2cffaf |
@@ -27,8 +27,8 @@ import java.util.Map;
|
|
|
2cffaf |
import java.util.ResourceBundle;
|
|
|
2cffaf |
import org.apache.maven.doxia.markup.HtmlMarkup;
|
|
|
2cffaf |
import org.apache.maven.doxia.sink.Sink;
|
|
|
2cffaf |
-import org.apache.maven.doxia.sink.SinkEventAttributeSet;
|
|
|
2cffaf |
import org.apache.maven.doxia.sink.SinkEventAttributes;
|
|
|
2cffaf |
+import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
|
|
|
2cffaf |
import org.apache.maven.doxia.util.DoxiaUtils;
|
|
|
2cffaf |
import org.apache.maven.reporting.MavenReportException;
|
|
|
2cffaf |
|
|
|
2cffaf |
--
|
|
|
2cffaf |
2.5.5
|
|
|
2cffaf |
|