This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch doxia-2.0.0
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 455a9197e92ac4d491b764ec1671d110933b11c5
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Thu Nov 16 21:39:41 2023 +0100
[SUREFIRE-2227] Dynamically calculate xrefTestLocation
---
.../surefire/report/AbstractSurefireReport.java | 50 ++++++++++++----------
.../surefire/report/SurefireReportRenderer.java | 12 +++---
.../surefire/report/SurefireReportTest.java | 4 +-
.../surefire/report/stubs/EnclosedStub.java | 33 ++++++++++++++
.../report/stubs/EnclosedTrimStackTraceStub.java | 33 ++++++++++++++
.../surefire/report/stubs/NestedClassStub.java | 33 ++++++++++++++
.../stubs/NestedClassTrimStackTraceStub.java | 33 ++++++++++++++
.../surefire/report/stubs/SingleErrorStub.java | 33 ++++++++++++++
.../stubs/SurefireReportMavenProjectStub.java | 16 -------
.../plugin-config.xml | 2 +-
.../plugin-config.xml | 10 ++++-
.../plugin-config.xml | 10 ++++-
.../plugin-config.xml | 10 ++++-
.../basic-surefire-report-test/plugin-config.xml | 10 ++++-
.../plugin-config.xml | 10 ++++-
.../surefire-report-enclosed/plugin-config.xml | 10 ++++-
.../plugin-config.xml | 10 ++++-
.../surefire-report-nestedClass/plugin-config.xml | 10 ++++-
.../surefire-report-single-error/plugin-config.xml | 10 ++++-
19 files changed, 282 insertions(+), 57 deletions(-)
diff --git
a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReport.java
b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReport.java
index d6f141f74..7025da05a 100644
---
a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReport.java
+++
b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReport.java
@@ -25,6 +25,7 @@ import java.net.URL;
import java.net.URLClassLoader;
import java.text.MessageFormat;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@@ -32,6 +33,7 @@ import java.util.MissingResourceException;
import java.util.ResourceBundle;
import org.apache.maven.model.ReportPlugin;
+import org.apache.maven.model.Reporting;
import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
@@ -77,23 +79,19 @@ public abstract class AbstractSurefireReport extends
AbstractMavenReport {
private File reportsDirectory;
/**
- * The projects in the reactor for aggregation report.
+ * Link the violation line numbers to the (Test) Source XRef. Links will
be created automatically if the JXR plugin is
+ * being used.
*/
- @Parameter(defaultValue = "${reactorProjects}", readonly = true)
- private List<MavenProject> reactorProjects;
-
- /**
- * Link the failed tests line numbers to the source xref. Will link
- * automatically if Maven JXR plugin is being used.
- */
- @Parameter(defaultValue = "true", property = "linkXRef")
+ @Parameter(property = "linkXRef", defaultValue = "true")
private boolean linkXRef;
/**
- * Location of the Xrefs to link.
+ * Location where Test Source XRef is generated for this project.
+ * <br>
+ * <strong>Default</strong>: {@link #getReportOutputDirectory()} + {@code
/xref-test}
*/
- @Parameter(defaultValue = "${project.reporting.outputDirectory}/xref-test")
- private File xrefLocation;
+ @Parameter
+ private File xrefTestLocation;
/**
* Whether to build an aggregated report at the root, or build individual
reports.
@@ -156,7 +154,7 @@ public abstract class AbstractSurefireReport extends
AbstractMavenReport {
locale,
getConsoleLogger(),
getReportsDirectories(),
- determineXrefLocation(),
+ constructXrefTestLocation(),
showSuccess);
r.render();
}
@@ -258,26 +256,28 @@ public abstract class AbstractSurefireReport extends
AbstractMavenReport {
return result;
}
- private String determineXrefLocation() {
+ private String constructXrefTestLocation() {
String location = null;
-
if (linkXRef) {
+ File xrefTestLocation = getXrefTestLocation();
+
String relativePath = PathTool.getRelativePath(
- getReportOutputDirectory().getAbsolutePath(),
xrefLocation.getAbsolutePath());
+ getReportOutputDirectory().getAbsolutePath(),
xrefTestLocation.getAbsolutePath());
if (relativePath == null || relativePath.isEmpty()) {
relativePath = ".";
}
- relativePath = relativePath + "/" + xrefLocation.getName();
- if (xrefLocation.exists()) {
+ relativePath = relativePath + "/" + xrefTestLocation.getName();
+ if (xrefTestLocation.exists()) {
// XRef was already generated by manual execution of a
lifecycle binding
location = relativePath;
} else {
// Not yet generated - check if the report is on its way
- for (Object o : project.getReportPlugins()) {
- ReportPlugin report = (ReportPlugin) o;
-
- String artifactId = report.getArtifactId();
- if ("maven-jxr-plugin".equals(artifactId) ||
"jxr-maven-plugin".equals(artifactId)) {
+ Reporting reporting = project.getModel().getReporting();
+ List<ReportPlugin> reportPlugins =
+ reporting != null ? reporting.getPlugins() :
Collections.<ReportPlugin>emptyList();
+ for (ReportPlugin plugin : reportPlugins) {
+ String artifactId = plugin.getArtifactId();
+ if ("maven-jxr-plugin".equals(artifactId)) {
location = relativePath;
}
}
@@ -290,6 +290,10 @@ public abstract class AbstractSurefireReport extends
AbstractMavenReport {
return location;
}
+ private File getXrefTestLocation() {
+ return xrefTestLocation != null ? xrefTestLocation : new
File(getReportOutputDirectory(), "xref-test");
+ }
+
/**
* @param locale The locale
* @param key The key to search for
diff --git
a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportRenderer.java
b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportRenderer.java
index c9dafe73f..971902bd7 100644
---
a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportRenderer.java
+++
b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportRenderer.java
@@ -51,7 +51,7 @@ public class SurefireReportRenderer extends
AbstractMavenReportRenderer {
private final SurefireReportParser parser;
private final List<ReportTestSuite> testSuites;
- private final String xrefLocation;
+ private final String xrefTestLocation;
private final boolean showSuccess;
public SurefireReportRenderer(
@@ -61,7 +61,7 @@ public class SurefireReportRenderer extends
AbstractMavenReportRenderer {
Locale locale,
ConsoleLogger consoleLogger,
List<File> reportsDirectories,
- String xrefLocation,
+ String xrefTestLocation,
boolean showSuccess) {
super(sink);
this.i18n = i18n;
@@ -70,7 +70,7 @@ public class SurefireReportRenderer extends
AbstractMavenReportRenderer {
parser = new SurefireReportParser(reportsDirectories, consoleLogger);
testSuites = parser.parseXMLReportFiles();
this.showSuccess = showSuccess;
- this.xrefLocation = xrefLocation;
+ this.xrefTestLocation = xrefTestLocation;
}
@Override
@@ -507,13 +507,13 @@ public class SurefireReportRenderer extends
AbstractMavenReportRenderer {
String fullClassName = testCase.getFullClassName();
String errorLineNumber = testCase.getFailureErrorLine();
- if (xrefLocation != null) {
+ if (xrefTestLocation != null) {
String path = fullClassName.replace('.', '/');
- sink.link(xrefLocation + "/" + path + ".html#L" +
errorLineNumber);
+ sink.link(xrefTestLocation + "/" + path + ".html#L" +
errorLineNumber);
}
sink.text(fullClassName + ":" + errorLineNumber);
- if (xrefLocation != null) {
+ if (xrefTestLocation != null) {
sink.link_();
}
sink.unknown("div", TAG_TYPE_END, null);
diff --git
a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportTest.java
b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportTest.java
index df12fbedc..88edc4fc9 100644
---
a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportTest.java
+++
b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportTest.java
@@ -91,7 +91,7 @@ public class SurefireReportTest extends AbstractMojoTestCase {
boolean showSuccess = (Boolean) getVariableValueFromObject(mojo,
"showSuccess");
File reportsDir = (File) getVariableValueFromObject(mojo,
"reportsDirectory");
String outputName = (String) getVariableValueFromObject(mojo,
"outputName");
- File xrefLocation = (File) getVariableValueFromObject(mojo,
"xrefLocation");
+ File xrefTestLocation = (File) getVariableValueFromObject(mojo,
"xrefTestLocation");
boolean linkXRef = (Boolean) getVariableValueFromObject(mojo,
"linkXRef");
assertEquals(new File(getBasedir() +
"/target/site/unit/basic-surefire-report-test"), outputDir);
@@ -103,7 +103,7 @@ public class SurefireReportTest extends
AbstractMojoTestCase {
assertEquals("surefire", outputName);
assertEquals(
new File(getBasedir() +
"/target/site/unit/basic-surefire-report-test/xref-test").getAbsolutePath(),
- xrefLocation.getAbsolutePath());
+ xrefTestLocation.getAbsolutePath());
assertTrue(linkXRef);
mojo.execute();
diff --git
a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/EnclosedStub.java
b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/EnclosedStub.java
index bdcce6b04..af41e63ef 100644
---
a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/EnclosedStub.java
+++
b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/EnclosedStub.java
@@ -18,7 +18,40 @@
*/
package org.apache.maven.plugins.surefire.report.stubs;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.model.Model;
+import org.apache.maven.model.ReportPlugin;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+
public class EnclosedStub extends SurefireReportMavenProjectStub {
+ private List<ReportPlugin> reportPlugins = new ArrayList<>();
+
+ public EnclosedStub() {
+ MavenXpp3Reader pomReader = new MavenXpp3Reader();
+ Model model = null;
+
+ try (InputStream is = new FileInputStream(getFile())) {
+ model = pomReader.read(is);
+ setModel(model);
+ } catch (Exception e) {
+ }
+
+ setReportPlugins(model.getReporting().getPlugins());
+ }
+
+ public void setReportPlugins(List<ReportPlugin> plugins) {
+ this.reportPlugins = plugins;
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public List<ReportPlugin> getReportPlugins() {
+ return reportPlugins;
+ }
@Override
protected String getProjectDirName() {
diff --git
a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/EnclosedTrimStackTraceStub.java
b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/EnclosedTrimStackTraceStub.java
index f5ba0e74b..a4fb0169c 100644
---
a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/EnclosedTrimStackTraceStub.java
+++
b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/EnclosedTrimStackTraceStub.java
@@ -18,7 +18,40 @@
*/
package org.apache.maven.plugins.surefire.report.stubs;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.model.Model;
+import org.apache.maven.model.ReportPlugin;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+
public class EnclosedTrimStackTraceStub extends SurefireReportMavenProjectStub
{
+ private List<ReportPlugin> reportPlugins = new ArrayList<>();
+
+ public EnclosedTrimStackTraceStub() {
+ MavenXpp3Reader pomReader = new MavenXpp3Reader();
+ Model model = null;
+
+ try (InputStream is = new FileInputStream(getFile())) {
+ model = pomReader.read(is);
+ setModel(model);
+ } catch (Exception e) {
+ }
+
+ setReportPlugins(model.getReporting().getPlugins());
+ }
+
+ public void setReportPlugins(List<ReportPlugin> plugins) {
+ this.reportPlugins = plugins;
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public List<ReportPlugin> getReportPlugins() {
+ return reportPlugins;
+ }
@Override
protected String getProjectDirName() {
diff --git
a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/NestedClassStub.java
b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/NestedClassStub.java
index 6f1547b37..2b80adc72 100644
---
a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/NestedClassStub.java
+++
b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/NestedClassStub.java
@@ -18,7 +18,40 @@
*/
package org.apache.maven.plugins.surefire.report.stubs;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.model.Model;
+import org.apache.maven.model.ReportPlugin;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+
public class NestedClassStub extends SurefireReportMavenProjectStub {
+ private List<ReportPlugin> reportPlugins = new ArrayList<>();
+
+ public NestedClassStub() {
+ MavenXpp3Reader pomReader = new MavenXpp3Reader();
+ Model model = null;
+
+ try (InputStream is = new FileInputStream(getFile())) {
+ model = pomReader.read(is);
+ setModel(model);
+ } catch (Exception e) {
+ }
+
+ setReportPlugins(model.getReporting().getPlugins());
+ }
+
+ public void setReportPlugins(List<ReportPlugin> plugins) {
+ this.reportPlugins = plugins;
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public List<ReportPlugin> getReportPlugins() {
+ return reportPlugins;
+ }
@Override
protected String getProjectDirName() {
diff --git
a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/NestedClassTrimStackTraceStub.java
b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/NestedClassTrimStackTraceStub.java
index 1a30076f5..1cebc2015 100644
---
a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/NestedClassTrimStackTraceStub.java
+++
b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/NestedClassTrimStackTraceStub.java
@@ -18,7 +18,40 @@
*/
package org.apache.maven.plugins.surefire.report.stubs;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.model.Model;
+import org.apache.maven.model.ReportPlugin;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+
public class NestedClassTrimStackTraceStub extends
SurefireReportMavenProjectStub {
+ private List<ReportPlugin> reportPlugins = new ArrayList<>();
+
+ public NestedClassTrimStackTraceStub() {
+ MavenXpp3Reader pomReader = new MavenXpp3Reader();
+ Model model = null;
+
+ try (InputStream is = new FileInputStream(getFile())) {
+ model = pomReader.read(is);
+ setModel(model);
+ } catch (Exception e) {
+ }
+
+ setReportPlugins(model.getReporting().getPlugins());
+ }
+
+ public void setReportPlugins(List<ReportPlugin> plugins) {
+ this.reportPlugins = plugins;
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public List<ReportPlugin> getReportPlugins() {
+ return reportPlugins;
+ }
@Override
protected String getProjectDirName() {
diff --git
a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SingleErrorStub.java
b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SingleErrorStub.java
index 60e83182e..8bff72dc4 100644
---
a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SingleErrorStub.java
+++
b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SingleErrorStub.java
@@ -18,7 +18,40 @@
*/
package org.apache.maven.plugins.surefire.report.stubs;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.model.Model;
+import org.apache.maven.model.ReportPlugin;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+
public class SingleErrorStub extends SurefireReportMavenProjectStub {
+ private List<ReportPlugin> reportPlugins = new ArrayList<>();
+
+ public SingleErrorStub() {
+ MavenXpp3Reader pomReader = new MavenXpp3Reader();
+ Model model = null;
+
+ try (InputStream is = new FileInputStream(getFile())) {
+ model = pomReader.read(is);
+ setModel(model);
+ } catch (Exception e) {
+ }
+
+ setReportPlugins(model.getReporting().getPlugins());
+ }
+
+ public void setReportPlugins(List<ReportPlugin> plugins) {
+ this.reportPlugins = plugins;
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public List<ReportPlugin> getReportPlugins() {
+ return reportPlugins;
+ }
@Override
protected String getProjectDirName() {
diff --git
a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub.java
b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub.java
index 952b6ff39..9f5606292 100644
---
a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub.java
+++
b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub.java
@@ -47,22 +47,6 @@ public abstract class SurefireReportMavenProjectStub extends
MavenProjectStub {
return new File(getBasedir(), "plugin-config.xml");
}
- /**
- * {@inheritDoc}
- */
- @Override
- public List<ReportPlugin> getReportPlugins() {
- Reporting reporting = new Reporting();
-
- ReportPlugin reportPlugin = new ReportPlugin();
- reportPlugin.setGroupId("org.apache.maven.plugins");
- reportPlugin.setArtifactId("maven-jxr-plugin");
- reportPlugin.setVersion("2.0-SNAPSHOT");
- reporting.addPlugin(reportPlugin);
-
- return reporting.getPlugins();
- }
-
@Override
public List<ArtifactRepository> getRemoteArtifactRepositories() {
ArtifactRepository repository = new MavenArtifactRepository(
diff --git
a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-anchor-test-cases/plugin-config.xml
b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-anchor-test-cases/plugin-config.xml
index 2e31083fc..9d7ec6d19 100644
---
a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-anchor-test-cases/plugin-config.xml
+++
b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-anchor-test-cases/plugin-config.xml
@@ -29,7 +29,7 @@
<reportsDirectory>${basedir}/src/test/resources/unit/basic-surefire-report-anchor-test-cases/surefire-reports
</reportsDirectory>
<outputName>surefire</outputName>
-
<xrefLocation>${basedir}/target/site/unit/basic-surefire-report-anchor-test-cases/xref-test</xrefLocation>
+
<xrefTestLocation>${basedir}/target/site/unit/basic-surefire-report-anchor-test-cases/xref-test</xrefTestLocation>
</configuration>
</plugin>
</plugins>
diff --git
a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-linkxref-false/plugin-config.xml
b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-linkxref-false/plugin-config.xml
index e4e34dede..d2526ef91 100644
---
a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-linkxref-false/plugin-config.xml
+++
b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-linkxref-false/plugin-config.xml
@@ -29,10 +29,18 @@
<reportsDirectory>${basedir}/src/test/resources/unit/basic-surefire-report-linkxref-false/surefire-reports
</reportsDirectory>
<outputName>surefire</outputName>
-
<xrefLocation>${basedir}/target/site/unit/basic-surefire-report-linkxref-false/xref-test</xrefLocation>
+
<xrefTestLocation>${basedir}/target/site/unit/basic-surefire-report-linkxref-false/xref-test</xrefTestLocation>
<linkXRef>false</linkXRef>
</configuration>
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
diff --git
a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-reporting-null/plugin-config.xml
b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-reporting-null/plugin-config.xml
index 76f2af455..a3d1cd244 100644
---
a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-reporting-null/plugin-config.xml
+++
b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-reporting-null/plugin-config.xml
@@ -29,10 +29,18 @@
<reportsDirectory>${basedir}/src/test/resources/unit/basic-surefire-report-reporting-null/surefire-reports
</reportsDirectory>
<outputName>surefire</outputName>
-
<xrefLocation>${basedir}/target/site/unit/basic-surefire-report-test/xref-test</xrefLocation>
+
<xrefTestLocation>${basedir}/target/site/unit/basic-surefire-report-test/xref-test</xrefTestLocation>
<linkXRef>true</linkXRef>
</configuration>
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
diff --git
a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-success-false/plugin-config.xml
b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-success-false/plugin-config.xml
index e00d008fd..bdc5e0503 100644
---
a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-success-false/plugin-config.xml
+++
b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-success-false/plugin-config.xml
@@ -29,10 +29,18 @@
<reportsDirectory>${basedir}/src/test/resources/unit/basic-surefire-report-success-false/surefire-reports
</reportsDirectory>
<outputName>surefire</outputName>
-
<xrefLocation>${basedir}/target/site/unit/basic-surefire-report-success-false/xref-test</xrefLocation>
+
<xrefTestLocation>${basedir}/target/site/unit/basic-surefire-report-success-false/xref-test</xrefTestLocation>
<linkXRef>true</linkXRef>
</configuration>
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
diff --git
a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-test/plugin-config.xml
b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-test/plugin-config.xml
index 1d469a52e..7a0491175 100644
---
a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-test/plugin-config.xml
+++
b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-test/plugin-config.xml
@@ -29,10 +29,18 @@
<reportsDirectory>${basedir}/src/test/resources/unit/basic-surefire-report-test/surefire-reports
</reportsDirectory>
<outputName>surefire</outputName>
-
<xrefLocation>${basedir}/target/site/unit/basic-surefire-report-test/xref-test</xrefLocation>
+
<xrefTestLocation>${basedir}/target/site/unit/basic-surefire-report-test/xref-test</xrefTestLocation>
<linkXRef>true</linkXRef>
</configuration>
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
diff --git
a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed-trimStackTrace/plugin-config.xml
b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed-trimStackTrace/plugin-config.xml
index fddf49aaa..b17f2e797 100644
---
a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed-trimStackTrace/plugin-config.xml
+++
b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed-trimStackTrace/plugin-config.xml
@@ -29,10 +29,18 @@
<reportsDirectory>${basedir}/src/test/resources/unit/surefire-report-enclosed-trimStackTrace/surefire-reports
</reportsDirectory>
<outputName>surefire</outputName>
-
<xrefLocation>${basedir}/target/site/unit/surefire-report-enclosed-trimStackTrace/xref-test</xrefLocation>
+
<xrefTestLocation>${basedir}/target/site/unit/surefire-report-enclosed-trimStackTrace/xref-test</xrefTestLocation>
<linkXRef>true</linkXRef>
</configuration>
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
diff --git
a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed/plugin-config.xml
b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed/plugin-config.xml
index 092107a52..c13c724b6 100644
---
a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed/plugin-config.xml
+++
b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed/plugin-config.xml
@@ -29,10 +29,18 @@
<reportsDirectory>${basedir}/src/test/resources/unit/surefire-report-enclosed/surefire-reports
</reportsDirectory>
<outputName>surefire</outputName>
-
<xrefLocation>${basedir}/target/site/unit/surefire-report-enclosed/xref-test</xrefLocation>
+
<xrefTestLocation>${basedir}/target/site/unit/surefire-report-enclosed/xref-test</xrefTestLocation>
<linkXRef>true</linkXRef>
</configuration>
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
diff --git
a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass-trimStackTrace/plugin-config.xml
b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass-trimStackTrace/plugin-config.xml
index d4bf13fa7..873289b05 100644
---
a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass-trimStackTrace/plugin-config.xml
+++
b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass-trimStackTrace/plugin-config.xml
@@ -29,10 +29,18 @@
<reportsDirectory>${basedir}/src/test/resources/unit/surefire-report-nestedClass-trimStackTrace/surefire-reports
</reportsDirectory>
<outputName>surefire</outputName>
-
<xrefLocation>${basedir}/target/site/unit/surefire-report-nestedClass-trimStackTrace/xref-test</xrefLocation>
+
<xrefTestLocation>${basedir}/target/site/unit/surefire-report-nestedClass-trimStackTrace/xref-test</xrefTestLocation>
<linkXRef>true</linkXRef>
</configuration>
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
diff --git
a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass/plugin-config.xml
b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass/plugin-config.xml
index 542475533..5940c18b9 100644
---
a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass/plugin-config.xml
+++
b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass/plugin-config.xml
@@ -29,10 +29,18 @@
<reportsDirectory>${basedir}/src/test/resources/unit/surefire-report-nestedClass/surefire-reports
</reportsDirectory>
<outputName>surefire</outputName>
-
<xrefLocation>${basedir}/target/site/unit/surefire-report-nestedClass/xref-test</xrefLocation>
+
<xrefTestLocation>${basedir}/target/site/unit/surefire-report-nestedClass/xref-test</xrefTestLocation>
<linkXRef>true</linkXRef>
</configuration>
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
diff --git
a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-single-error/plugin-config.xml
b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-single-error/plugin-config.xml
index 045f0d93d..f097b1ad7 100644
---
a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-single-error/plugin-config.xml
+++
b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-single-error/plugin-config.xml
@@ -29,10 +29,18 @@
<reportsDirectory>${basedir}/src/test/resources/unit/surefire-report-single-error/surefire-reports
</reportsDirectory>
<outputName>surefire</outputName>
-
<xrefLocation>${basedir}/target/site/unit/surefire-report-single-error/xref-test</xrefLocation>
+
<xrefTestLocation>${basedir}/target/site/unit/surefire-report-single-error/xref-test</xrefTestLocation>
<linkXRef>true</linkXRef>
</configuration>
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
