This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new f220fc5 Show dependency details and convergence marks without images
or JavaScript
f220fc5 is described below
commit f220fc508f7686a28afda486adbe58dfd1fbb896
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Sun Nov 1 12:46:43 2026 +0000
Show dependency details and convergence marks without images or JavaScript
Fixes #687.
---
src/it/full-pom/verify.groovy | 24 ++++++++++
.../report/projectinfo/DependenciesReport.java | 50 --------------------
.../projectinfo/DependencyConvergenceReport.java | 18 +------
.../renderer/DependenciesRenderer.java | 52 ++-------------------
.../report/projectinfo/resources/images/close.gif | Bin 279 -> 0 bytes
.../report/projectinfo/resources/resources.txt | 1 -
src/main/resources/project-info-reports.properties | 7 ++-
.../resources/project-info-reports_de.properties | 7 ++-
.../resources/project-info-reports_ru.properties | 7 ++-
.../project-info-reports_zh_CN.properties | 7 ++-
.../DependencyConvergenceReportTest.java | 12 +++++
11 files changed, 54 insertions(+), 131 deletions(-)
diff --git a/src/it/full-pom/verify.groovy b/src/it/full-pom/verify.groovy
index 0f97cc6..e851b77 100644
--- a/src/it/full-pom/verify.groovy
+++ b/src/it/full-pom/verify.groovy
@@ -123,6 +123,18 @@ try
return false;
}
+ // MPIR #687: tree details use <details>/<summary>, no images or JavaScript
+ if ( !content.contains( "<details><summary>" ) || !content.contains(
"</details>" ) )
+ {
+ System.err.println( "dependencies.html doesn't contain
<details><summary> for the dependency tree" );
+ return false;
+ }
+ if ( content.contains( "toggleDependencyDetails" ) || content.contains(
"icon_info_sml" ) || content.contains( "close.gif" ) )
+ {
+ System.err.println( "dependencies.html still uses images or JavaScript
for dependency details" );
+ return false;
+ }
+
// MPIR-216: dependency with range
File dependencyMgmt = new File( siteDir, "dependency-management.html");
content = FileUtils.fileRead( dependencyMgmt, "UTF-8" );
@@ -141,6 +153,18 @@ try
return false;
}
+ // MPIR #687: convergence marks are text, not images
+ if ( !content.contains( "<td>✘ " ) )
+ {
+ System.err.println( "dependency-convergence doesn't contain the text
error mark" );
+ return false;
+ }
+ if ( content.contains( "icon_success_sml" ) || content.contains(
"icon_error_sml" ) )
+ {
+ System.err.println( "dependency-convergence still uses icon images" );
+ return false;
+ }
+
}
catch ( Throwable t )
{
diff --git
a/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
b/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
index 13be4de..1829e44 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
@@ -20,15 +20,6 @@ package org.apache.maven.report.projectinfo;
import javax.inject.Inject;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.LineNumberReader;
-import java.io.OutputStream;
-import java.nio.charset.StandardCharsets;
import java.util.Locale;
import org.apache.maven.artifact.Artifact;
@@ -49,7 +40,6 @@ import
org.apache.maven.report.projectinfo.dependencies.renderer.DependenciesRen
import org.apache.maven.reporting.MavenReportException;
import org.apache.maven.shared.jar.classes.JarClassesAnalysis;
import org.codehaus.plexus.i18n.I18N;
-import org.codehaus.plexus.util.IOUtil;
import org.eclipse.aether.RepositorySystem;
/**
@@ -61,11 +51,6 @@ import org.eclipse.aether.RepositorySystem;
*/
@Mojo(name = "dependencies", requiresDependencyResolution =
ResolutionScope.TEST)
public class DependenciesReport extends AbstractProjectInfoReport {
- /**
- * Images resources dir
- */
- private static final String RESOURCES_DIR =
"org/apache/maven/report/projectinfo/resources";
-
// ----------------------------------------------------------------------
// Mojo parameters
// ----------------------------------------------------------------------
@@ -132,12 +117,6 @@ public class DependenciesReport extends
AbstractProjectInfoReport {
@Override
public void executeReport(Locale locale) {
- try {
- copyResources(getReportOutputDirectory());
- } catch (IOException e) {
- getLog().error("Cannot copy resources", e);
- }
-
DependencyNode dependencyNode = resolveProject();
Dependencies dependencies = new Dependencies(project, dependencyNode,
classesAnalyzer);
@@ -196,33 +175,4 @@ public class DependenciesReport extends
AbstractProjectInfoReport {
return null;
}
}
-
- /**
- * @param outputDirectory the wanted output directory
- * @throws IOException if any
- */
- private void copyResources(File outputDirectory) throws IOException {
- InputStream resourceList =
getClass().getClassLoader().getResourceAsStream(RESOURCES_DIR +
"/resources.txt");
- if (resourceList != null) {
- try (BufferedReader reader =
- new LineNumberReader(new InputStreamReader(resourceList,
StandardCharsets.US_ASCII))) {
- for (String line = reader.readLine(); line != null; line =
reader.readLine()) {
- try (InputStream in =
getClass().getClassLoader().getResourceAsStream(RESOURCES_DIR + "/" + line)) {
- if (in == null) {
- throw new IOException("The resource " + line + "
doesn't exist.");
- }
-
- File outputFile = new File(outputDirectory, line);
- if (!outputFile.getParentFile().exists()) {
- outputFile.getParentFile().mkdirs();
- }
-
- try (OutputStream out = new
FileOutputStream(outputFile)) {
- IOUtil.copy(in, out);
- }
- }
- }
- }
- }
- }
}
diff --git
a/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
b/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
index dd1c5fb..32042f4 100644
---
a/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
+++
b/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
@@ -63,16 +63,6 @@ import org.eclipse.aether.RepositorySystem;
*/
@Mojo(name = "dependency-convergence", aggregator = true)
public class DependencyConvergenceReport extends AbstractProjectInfoReport {
- /**
- * URL for the 'icon_success_sml.gif' image
- */
- private static final String IMG_SUCCESS_URL =
"images/icon_success_sml.gif";
-
- /**
- * URL for the 'icon_error_sml.gif' image
- */
- private static final String IMG_ERROR_URL = "images/icon_error_sml.gif";
-
private static final int FULL_CONVERGENCE = 100;
private ArtifactFilter filter = null;
@@ -616,15 +606,11 @@ public class DependencyConvergenceReport extends
AbstractProjectInfoReport {
}
private void iconSuccess(Locale locale, Sink sink) {
- SinkEventAttributes attributes =
- new SinkEventAttributeSet(SinkEventAttributes.ALT,
getI18nString(locale, "icon.success"));
- sink.figureGraphics(IMG_SUCCESS_URL, attributes);
+ sink.text("\u2714 " + getI18nString(locale, "icon.success"));
}
private void iconError(Locale locale, Sink sink) {
- SinkEventAttributes attributes =
- new SinkEventAttributeSet(SinkEventAttributes.ALT,
getI18nString(locale, "icon.error"));
- sink.figureGraphics(IMG_ERROR_URL, attributes);
+ sink.text("\u2718 " + getI18nString(locale, "icon.error"));
}
/**
diff --git
a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
index ec50f4d..6086c42 100644
---
a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
+++
b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
@@ -22,8 +22,6 @@ import javax.swing.text.html.HTML.Attribute;
import java.io.File;
import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.text.FieldPosition;
@@ -74,12 +72,6 @@ import
org.eclipse.aether.resolution.ArtifactResolutionException;
*/
public class DependenciesRenderer extends AbstractProjectInfoRenderer {
- /** URL for the 'icon_info_sml.gif' image */
- private static final String IMG_INFO_URL = "./images/icon_info_sml.gif";
-
- /** URL for the 'close.gif' image */
- private static final String IMG_CLOSE_URL = "./images/close.gif";
-
private static final Set<String> JAR_SUBTYPE;
private final DependencyNode dependencyNode;
@@ -98,9 +90,6 @@ public class DependenciesRenderer extends
AbstractProjectInfoRenderer {
private final MessageFormat javaVersionFormat =
new
MessageFormat("{0,choice,0#|1.1#{0,number,0.0}|9#{0,number,0}}", Locale.ROOT);
- /** Counter for unique IDs that is consistent across generations. */
- private int idCounter = 0;
-
/**
* Will be filled with license name / set of projects.
*/
@@ -302,29 +291,6 @@ public class DependenciesRenderer extends
AbstractProjectInfoRenderer {
}
private void renderSectionDependencyTree() {
- StringWriter sw = new StringWriter();
- PrintWriter pw = new PrintWriter(sw);
-
- pw.println(" function toggleDependencyDetails( divId, imgId )");
- pw.println(" {");
- pw.println(" var div = document.getElementById( divId );");
- pw.println(" var img = document.getElementById( imgId );");
- pw.println(" if( div.style.display == '' )");
- pw.println(" {");
- pw.println(" div.style.display = 'none';");
- pw.printf(" img.src='%s';%n", IMG_INFO_URL);
- pw.printf(" img.alt='%s';%n",
getI18nString("graph.icon.information"));
- pw.println(" }");
- pw.println(" else");
- pw.println(" {");
- pw.println(" div.style.display = '';");
- pw.printf(" img.src='%s';%n", IMG_CLOSE_URL);
- pw.printf(" img.alt='%s';%n",
getI18nString("graph.icon.close"));
- pw.println(" }");
- pw.println(" }");
-
- javaScript(sw.toString());
-
// for Dependencies Graph Tree
startSection(getI18nString("graph.tree.title"));
@@ -794,22 +760,12 @@ public class DependenciesRenderer extends
AbstractProjectInfoRenderer {
private void printDependencyListing(DependencyNode node) {
Artifact artifact = node.getArtifact();
String id = artifact.getId();
- String dependencyDetailId = "_dep" + idCounter++;
- String imgId = "_img" + idCounter++;
sink.listItem();
sink.text(id + (StringUtils.isNotEmpty(artifact.getScope()) ? " (" +
artifact.getScope() + ") " : " "));
- String javascript = String.format(
- "<img id=\"%s\" src=\"%s\" alt=\"%s\""
- + " onclick=\"toggleDependencyDetails( '%s', '%s' );\""
- + " style=\"cursor: pointer; vertical-align:
text-bottom;\" />",
- imgId, IMG_INFO_URL, getI18nString("graph.icon.information"),
dependencyDetailId, imgId);
-
- sink.rawText(javascript);
-
- printDescriptionsAndURLs(node, dependencyDetailId);
+ printDescriptionsAndURLs(node);
if (!node.getChildren().isEmpty()) {
boolean toBeIncluded = false;
@@ -833,12 +789,12 @@ public class DependenciesRenderer extends
AbstractProjectInfoRenderer {
sink.listItem_();
}
- private void printDescriptionsAndURLs(DependencyNode node, String uid) {
+ private void printDescriptionsAndURLs(DependencyNode node) {
Artifact artifact = node.getArtifact();
String id = artifact.getId();
String unknownLicenseMessage = getI18nString("graph.tables.unknown");
- sink.rawText("<div id=\"" + uid + "\" style=\"display:none\">");
+ sink.rawText("<details><summary>" +
getI18nString("graph.icon.information") + "</summary>");
if (!Artifact.SCOPE_SYSTEM.equals(artifact.getScope())) {
try {
@@ -976,7 +932,7 @@ public class DependenciesRenderer extends
AbstractProjectInfoRenderer {
endTable();
}
- sink.rawText("</div>");
+ sink.rawText("</details>");
}
private void printGroupedLicenses() {
diff --git
a/src/main/resources/org/apache/maven/report/projectinfo/resources/images/close.gif
b/src/main/resources/org/apache/maven/report/projectinfo/resources/images/close.gif
deleted file mode 100644
index 1c26bbc..0000000
Binary files
a/src/main/resources/org/apache/maven/report/projectinfo/resources/images/close.gif
and /dev/null differ
diff --git
a/src/main/resources/org/apache/maven/report/projectinfo/resources/resources.txt
b/src/main/resources/org/apache/maven/report/projectinfo/resources/resources.txt
deleted file mode 100644
index 2cc76fb..0000000
---
a/src/main/resources/org/apache/maven/report/projectinfo/resources/resources.txt
+++ /dev/null
@@ -1 +0,0 @@
-images/close.gif
diff --git a/src/main/resources/project-info-reports.properties
b/src/main/resources/project-info-reports.properties
index e637616..2126d23 100644
--- a/src/main/resources/project-info-reports.properties
+++ b/src/main/resources/project-info-reports.properties
@@ -73,8 +73,7 @@ report.dependencies.file.details.multirelease.root
= Root
report.dependencies.file.details.multirelease.versioned = Versioned
report.dependencies.file.details.title =
Dependency File Details
report.dependencies.file.details.total = Total
-report.dependencies.graph.icon.close = [Close]
-report.dependencies.graph.icon.information =
[Information]
+report.dependencies.graph.icon.information =
Information
report.dependencies.graph.tables.licenses = Licenses
report.dependencies.graph.tables.unknown = Unknown
report.dependencies.graph.title = Project
Dependency Graph
@@ -108,8 +107,8 @@ report.dependencies.transitive.title
= Project Tra
report.dependency-convergence.convergence.caption =
Dependencies used in modules
report.dependency-convergence.convergence.single.caption =
Dependencies used in this project
report.dependency-convergence.description = This
document presents the convergence of dependency versions across the entire
project, and its sub modules.
-report.dependency-convergence.icon.error = [Error]
-report.dependency-convergence.icon.success = [Success]
+report.dependency-convergence.icon.error = Error
+report.dependency-convergence.icon.success = Success
report.dependency-convergence.legend = Legend:
report.dependency-convergence.legend.different = At least
one dependency has a differing version of the dependency or has SNAPSHOT
dependencies.
report.dependency-convergence.legend.shared = All
modules/dependencies share one version of the dependency.
diff --git a/src/main/resources/project-info-reports_de.properties
b/src/main/resources/project-info-reports_de.properties
index 6588c40..894de26 100644
--- a/src/main/resources/project-info-reports_de.properties
+++ b/src/main/resources/project-info-reports_de.properties
@@ -73,8 +73,7 @@ report.dependencies.file.details.multirelease.root
= Wurzel
report.dependencies.file.details.multirelease.versioned =
Versioniert
report.dependencies.file.details.title = Details
zu den Abh\u00e4ngigkeiten
report.dependencies.file.details.total = Gesamt
-report.dependencies.graph.icon.close =
[schlie\u00dfen]
-report.dependencies.graph.icon.information =
[Information]
+report.dependencies.graph.icon.information =
Information
report.dependencies.graph.tables.licenses = Lizenzen
report.dependencies.graph.tables.unknown = Unbekannt
report.dependencies.graph.title =
Abh\u00e4ngigkeitsgraph
@@ -108,8 +107,8 @@ report.dependencies.transitive.title
= Transitive
report.dependency-convergence.convergence.caption = In
Modulen verwendete Abh\u00e4ngigkeiten
report.dependency-convergence.convergence.single.caption = In diesem
Projekt verwendete Abh\u00e4ngigkeiten
report.dependency-convergence.description = Dieses
Dokument informiert \u00fcber die Konvergenz der Versionen von
Abh\u00e4ngigkeiten des gesamten Projektes inklusive seiner Module.
-report.dependency-convergence.icon.error = [Fehler]
-report.dependency-convergence.icon.success = [Erfolg]
+report.dependency-convergence.icon.error = Fehler
+report.dependency-convergence.icon.success = Erfolg
report.dependency-convergence.legend = Legende:
report.dependency-convergence.legend.different =
Mindestens eine Abh\u00e4ngigkeit verwendet eine andere Version der
Abh\u00e4ngigkeit oder hat SNAPSHOT-Abh\u00e4ngigkeiten.
report.dependency-convergence.legend.shared = Alle
Module/Abh\u00e4ngigkeiten verwenden dieselbe Version der Abh\u00e4ngigkeit.
diff --git a/src/main/resources/project-info-reports_ru.properties
b/src/main/resources/project-info-reports_ru.properties
index d3e9841..0db12fd 100644
--- a/src/main/resources/project-info-reports_ru.properties
+++ b/src/main/resources/project-info-reports_ru.properties
@@ -71,8 +71,7 @@ report.dependencies.file.details.column.size.kb
= \u043A\u041
report.dependencies.file.details.columntitle.debuginformation =
\u0423\u043A\u0430\u0437\u044B\u0432\u0430\u0435\u0442,
\u0431\u044B\u043B\u0438 \u043B\u0438 \u0434\u0430\u043D\u043D\u044B\u0435
\u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441\u0442\u0438
\u0441\u043A\u043E\u043C\u043F\u0438\u043B\u0438\u0440\u043E\u0432\u0430\u043D\u044B
\u0441 \u043E\u0442\u043B\u0430\u0434\u043E\u0447\u043D\u043E\u0439
\u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u0435\u0439.
report.dependencies.file.details.title =
\u0414\u0435\u0442\u0430\u043B\u0438 \u0424\u0430\u0439\u043B\u0430
\u0417\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441\u0442\u0435\u0439
report.dependencies.file.details.total =
\u0412\u0441\u0435\u0433\u043E
-report.dependencies.graph.icon.close =
[\u0417\u0430\u043A\u0440\u044B\u0442\u044C]
-report.dependencies.graph.icon.information =
[\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F]
+report.dependencies.graph.icon.information =
\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F
report.dependencies.graph.tables.licenses =
\u041B\u0438\u0446\u0435\u043D\u0437\u0438\u0438
report.dependencies.graph.tables.unknown =
\u041D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u044B\u0435
report.dependencies.graph.title =
\u0414\u0438\u0430\u0433\u0440\u0430\u043C\u043C\u0430
\u0417\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441\u0442\u0435\u0439
\u041F\u0440\u043E\u0435\u043A\u0442\u0430
@@ -106,8 +105,8 @@ report.dependencies.transitive.title
= \u0422\u044
report.dependency-convergence.convergence.caption =
\u0417\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441\u0442\u0438,
\u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u043C\u044B\u0435 \u0432
\u043C\u043E\u0434\u0443\u043B\u044F\u0445
\u043F\u0440\u043E\u0435\u043A\u0442\u0430
report.dependency-convergence.convergence.single.caption =
\u0417\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441\u0442\u0438,
\u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u043C\u044B\u0435 \u0432
\u0434\u0430\u043D\u043D\u043E\u043C \u043F\u0440\u043E\u0435\u043A\u0442\u0435
report.dependency-convergence.description = \u0412
\u0434\u0430\u043D\u043D\u043E\u043C \u0440\u0430\u0437\u0434\u0435\u043B\u0435
\u043F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043B\u0435\u043D\u0430
\u0441\u0445\u043E\u0434\u0438\u043C\u043E\u0441\u0442\u044C
(\u043A\u043E\u043D\u0432\u0435\u0440\u0433\u0435\u043D\u0446\u0438\u044F)
\u0432\u0441\u0435\u0445 \u0432\u0435\u0440\u0441\u0438\u0439
\u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441\u0442\u043 [...]
-report.dependency-convergence.icon.error =
[\u041E\u0448\u0438\u0431\u043A\u0430]
-report.dependency-convergence.icon.success =
[\u0423\u0441\u043F\u0435\u0445]
+report.dependency-convergence.icon.error =
\u041E\u0448\u0438\u0431\u043A\u0430
+report.dependency-convergence.icon.success =
\u0423\u0441\u043F\u0435\u0445
report.dependency-convergence.legend =
\u0423\u0441\u043B\u043E\u0432\u043D\u044B\u0435
\u043E\u0431\u043E\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044F:
report.dependency-convergence.legend.different =
\u041A\u0430\u043A \u043C\u0438\u043D\u0438\u043C\u0443\u043C
\u043E\u0434\u043D\u0430
\u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0430
\u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441\u0442\u0435\u0439
\u043F\u0440\u043E\u0435\u043A\u0442\u0430 \u0438\u043C\u0435\u0435\u0442
\u0434\u0440\u0443\u0433\u0443\u044E \u0432\u0435\u0440\u0441\u0438\u044E
\u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441 [...]
report.dependency-convergence.legend.shared =
\u0412\u0441\u0435
\u043C\u043E\u0434\u0443\u043B\u0438/\u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0438
\u0438\u043C\u0435\u044E\u0442 \u043E\u0434\u043D\u0443 \u0438 \u0442\u0443
\u0436\u0435 \u0432\u0435\u0440\u0441\u0438\u044E
\u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441\u0442\u0438.
diff --git a/src/main/resources/project-info-reports_zh_CN.properties
b/src/main/resources/project-info-reports_zh_CN.properties
index a0716c9..ce08aa4 100644
--- a/src/main/resources/project-info-reports_zh_CN.properties
+++ b/src/main/resources/project-info-reports_zh_CN.properties
@@ -71,8 +71,7 @@ report.dependencies.file.details.column.size.kb
= kB
report.dependencies.file.details.columntitle.debuginformation =
\u8868\u660E\u8FD9\u4E9B\u4F9D\u8D56\u9879\u662F\u5426\u5DF2\u4F7F\u7528\u8C03\u8BD5\u4FE1\u606F\u8FDB\u884C\u7F16\u8BD1\u3002
report.dependencies.file.details.title =
\u4F9D\u8D56\u6587\u4EF6\u8BE6\u7EC6\u4FE1\u606F
report.dependencies.file.details.total =
\u5171\u8BA1
-report.dependencies.graph.icon.close = [Close]
-report.dependencies.graph.icon.information =
[Information]
+report.dependencies.graph.icon.information =
Information
report.dependencies.graph.tables.licenses =
\u6267\u7167
report.dependencies.graph.tables.unknown =
\u672A\u77E5
report.dependencies.graph.title =
\u9879\u76EE\u4F9D\u8D56\u56FE
@@ -106,8 +105,8 @@ report.dependencies.transitive.title
= \u9879\u76E
report.dependency-convergence.convergence.caption =
\u5B50\u9879\u76EE\u4E2D\u4F7F\u7528\u7684\u4F9D\u8D56
report.dependency-convergence.convergence.single.caption =
\u9879\u76EE\u4E2D\u4F7F\u7528\u7684\u4F9D\u8D56
report.dependency-convergence.description =
\u672C\u6587\u6863\u63D0\u4F9B\u4E86\u6574\u4E2A\u9879\u76EE\u4EE5\u53CA\u9879\u76EE\u7684\u5B50\u6A21\u5757\u4E2D\u6240\u6709\u4F9D\u8D56\u7684\u7248\u672C\u4E00\u81F4\u6027\u4FE1\u606F\u3002
-report.dependency-convergence.icon.error = [Error]
-report.dependency-convergence.icon.success = [Success]
+report.dependency-convergence.icon.error = Error
+report.dependency-convergence.icon.success = Success
report.dependency-convergence.legend =
\u8BF4\u660E
report.dependency-convergence.legend.different =
\u81F3\u5C11\u4E00\u4E2A\u9879\u76EE\u4F7F\u7528\u4E86\u4E0D\u540C\u7248\u672C\u7684\u4F9D\u8D56.
report.dependency-convergence.legend.shared =
\u6240\u6709\u7684\u9879\u76EE\u4F7F\u7528\u7EDF\u4E00\u7248\u672C\u7684\u4F9D\u8D56\u3002
diff --git
a/src/test/java/org/apache/maven/report/projectinfo/DependencyConvergenceReportTest.java
b/src/test/java/org/apache/maven/report/projectinfo/DependencyConvergenceReportTest.java
index 232aa2b..70a7a38 100644
---
a/src/test/java/org/apache/maven/report/projectinfo/DependencyConvergenceReportTest.java
+++
b/src/test/java/org/apache/maven/report/projectinfo/DependencyConvergenceReportTest.java
@@ -21,6 +21,8 @@ package org.apache.maven.report.projectinfo;
import javax.inject.Inject;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.util.Arrays;
import com.meterware.httpunit.GetMethodWebRequest;
@@ -41,6 +43,7 @@ import org.junit.jupiter.api.Test;
import static org.apache.maven.api.plugin.testing.MojoExtension.getTestFile;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.doAnswer;
@@ -125,5 +128,14 @@ public class DependencyConvergenceReportTest extends
AbstractProjectInfoTest {
// Test the texts
TextBlock[] textBlocks = response.getTextBlocks();
assertEquals(getString("report.dependency-convergence.reactor.name"),
textBlocks[1].getText());
+
+ // Marks are text, not images
+ String html = new String(
+
Files.readAllBytes(getTestFile("target/dependency-convergence/dependency-convergence.html")
+ .toPath()),
+ StandardCharsets.UTF_8);
+ assertTrue(html.contains("✔ " +
getString("report.dependency-convergence.icon.success")));
+ assertFalse(html.contains("icon_success_sml"));
+ assertFalse(html.contains("icon_error_sml"));
}
}