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-changes-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new d9d599a Show change types and the feed link as text instead of images
d9d599a is described below
commit d9d599a46f138813ffef8e159f44dabd8fe522e5
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Sun Nov 1 12:45:46 2026 +0000
Show change types and the feed link as text instead of images
Fixes #684.
---
src/it/report-changes-generation/pom.xml | 1 +
src/it/report-changes-generation/verify.groovy | 11 +++++++
.../maven/plugins/changes/ChangesReport.java | 26 ----------------
.../plugins/changes/ChangesReportRenderer.java | 4 +--
.../issues/AbstractIssuesReportRenderer.java | 34 ++++++---------------
src/main/resources/changes-report.properties | 6 ++++
.../apache/maven/plugins/changes/images/add.gif | Bin 207 -> 0 bytes
.../apache/maven/plugins/changes/images/fix.gif | Bin 181 -> 0 bytes
.../maven/plugins/changes/images/icon_help_sml.gif | Bin 1019 -> 0 bytes
.../apache/maven/plugins/changes/images/remove.gif | Bin 227 -> 0 bytes
.../apache/maven/plugins/changes/images/rss.png | Bin 249 -> 0 bytes
.../apache/maven/plugins/changes/images/update.gif | Bin 192 -> 0 bytes
12 files changed, 30 insertions(+), 52 deletions(-)
diff --git a/src/it/report-changes-generation/pom.xml
b/src/it/report-changes-generation/pom.xml
index 9a73752..d892816 100644
--- a/src/it/report-changes-generation/pom.xml
+++ b/src/it/report-changes-generation/pom.xml
@@ -85,6 +85,7 @@
<artifactId>maven-changes-plugin</artifactId>
<version>@project.version@</version>
<configuration>
+ <feedType>rss_2.0</feedType>
<issueLinkTemplatePerSystem>
<jira>http://myjira/browse/%ISSUE%</jira>
</issueLinkTemplatePerSystem>
diff --git a/src/it/report-changes-generation/verify.groovy
b/src/it/report-changes-generation/verify.groovy
index 44a6976..0a14231 100644
--- a/src/it/report-changes-generation/verify.groovy
+++ b/src/it/report-changes-generation/verify.groovy
@@ -43,3 +43,14 @@ assert content.contains('<td>-</td></tr>')
// HTML tags in action text are escaped, and not passed as raw text
assert content.contains('<strong>HTML tags</strong> are escaped
and not passed as raw text.')
+
+// change types are rendered as text, not as images
+assert content.contains('<td>Add</td>')
+assert content.contains('<td>Fix</td>')
+assert content.contains('<td>Remove</td>')
+assert content.contains('<td>Update</td>')
+['add.gif', 'fix.gif', 'update.gif', 'remove.gif', 'icon_help_sml.gif',
'rss.png'].each {
+ assert !content.contains(it): "changes.html still references ${it}"
+}
+assert content.contains('Get the RSS feed of the last changes:')
+assert content.contains('href="changes.rss">RSS</a>')
diff --git a/src/main/java/org/apache/maven/plugins/changes/ChangesReport.java
b/src/main/java/org/apache/maven/plugins/changes/ChangesReport.java
index 5163947..f785dc9 100644
--- a/src/main/java/org/apache/maven/plugins/changes/ChangesReport.java
+++ b/src/main/java/org/apache/maven/plugins/changes/ChangesReport.java
@@ -23,7 +23,6 @@ import javax.inject.Inject;
import java.io.File;
import java.io.IOException;
import java.io.Writer;
-import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -47,7 +46,6 @@ import org.apache.maven.reporting.MavenReportException;
import org.apache.maven.shared.filtering.MavenFileFilter;
import org.apache.maven.shared.filtering.MavenFileFilterRequest;
import org.apache.maven.shared.filtering.MavenFilteringException;
-import org.codehaus.plexus.util.FileUtils;
/**
* Goal which creates a nicely formatted Changes Report in html format from a
changes.xml file.
@@ -261,9 +259,6 @@ public class ChangesReport extends AbstractChangesReport {
report.setEscapeText(escapeText);
report.render();
-
- // Copy the images
- copyStaticResources();
}
private Map<String, String> prepareIssueLinksPerSystem() {
@@ -383,27 +378,6 @@ public class ChangesReport extends AbstractChangesReport {
return new ChangesXML(changesXml, getLog());
}
- private void copyStaticResources() throws MavenReportException {
- final String pluginResourcesBase = "org/apache/maven/plugins/changes";
- String[] resourceNames = {
- "images/add.gif",
- "images/fix.gif",
- "images/icon_help_sml.gif",
- "images/remove.gif",
- "images/rss.png",
- "images/update.gif"
- };
- try {
- getLog().debug("Copying static resources.");
- for (String resourceName : resourceNames) {
- URL url =
this.getClass().getClassLoader().getResource(pluginResourcesBase + "/" +
resourceName);
- FileUtils.copyURLToFile(url, new
File(getReportOutputDirectory(), resourceName));
- }
- } catch (IOException e) {
- throw new MavenReportException("Unable to copy static resources.");
- }
- }
-
private ResourceBundle getBundle(Locale locale) {
return ResourceBundle.getBundle(
"changes-report", locale, this.getClass().getClassLoader());
diff --git
a/src/main/java/org/apache/maven/plugins/changes/ChangesReportRenderer.java
b/src/main/java/org/apache/maven/plugins/changes/ChangesReportRenderer.java
index 95148f2..4a13597 100644
--- a/src/main/java/org/apache/maven/plugins/changes/ChangesReportRenderer.java
+++ b/src/main/java/org/apache/maven/plugins/changes/ChangesReportRenderer.java
@@ -159,7 +159,7 @@ public class ChangesReportRenderer extends
AbstractIssuesReportRenderer {
private void constructAction(Action action) {
sink.tableRow();
- sinkShowTypeIcon(action.getType());
+ sinkShowTypeText(action.getType());
sink.tableCell();
@@ -324,7 +324,7 @@ public class ChangesReportRenderer extends
AbstractIssuesReportRenderer {
text(bundle.getString("report.changes.text.rssfeed"));
sink.nonBreakingSpace();
sink.link("changes.rss");
- sinkFigure("images/rss.png", "rss feed");
+ text(bundle.getString("report.changes.text.rssfeed.link"));
sink.link_();
sink.paragraph_();
}
diff --git
a/src/main/java/org/apache/maven/plugins/changes/issues/AbstractIssuesReportRenderer.java
b/src/main/java/org/apache/maven/plugins/changes/issues/AbstractIssuesReportRenderer.java
index e9c2c67..550dd1f 100644
---
a/src/main/java/org/apache/maven/plugins/changes/issues/AbstractIssuesReportRenderer.java
+++
b/src/main/java/org/apache/maven/plugins/changes/issues/AbstractIssuesReportRenderer.java
@@ -21,8 +21,6 @@ package org.apache.maven.plugins.changes.issues;
import java.util.ResourceBundle;
import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.sink.SinkEventAttributes;
-import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
import org.apache.maven.reporting.AbstractMavenReportRenderer;
/**
@@ -97,37 +95,25 @@ public abstract class AbstractIssuesReportRenderer extends
AbstractMavenReportRe
sink.tableCell_();
}
- protected void sinkFigure(String image, String altText) {
- SinkEventAttributes attributes = new SinkEventAttributeSet();
- attributes.addAttribute("alt", altText);
- attributes.addAttribute("title", altText);
-
- sink.figureGraphics(image, attributes);
- }
-
- protected void sinkShowTypeIcon(String type) {
- String image = "";
- String altText = "";
+ protected void sinkShowTypeText(String type) {
+ String key;
if (type == null) {
- image = "images/icon_help_sml.gif";
- altText = "Unknown";
+ key = "unknown";
} else if (type.equals("fix")) {
- image = "images/fix.gif";
- altText = "Fix";
+ key = "fix";
} else if (type.equals("update")) {
- image = "images/update.gif";
- altText = "Update";
+ key = "update";
} else if (type.equals("add")) {
- image = "images/add.gif";
- altText = "Add";
+ key = "add";
} else if (type.equals("remove")) {
- image = "images/remove.gif";
- altText = "Remove";
+ key = "remove";
+ } else {
+ key = "unknown";
}
sink.tableCell();
- sinkFigure(image, altText);
+ text(bundle.getString("report.changes.label.type." + key));
sink.tableCell_();
}
}
diff --git a/src/main/resources/changes-report.properties
b/src/main/resources/changes-report.properties
index bdbcf5d..956eae3 100644
--- a/src/main/resources/changes-report.properties
+++ b/src/main/resources/changes-report.properties
@@ -27,8 +27,14 @@ report.changes.label.release=Release
report.changes.label.releaseDate=Date
report.changes.label.releaseDescription=Description
report.changes.label.releasehistory=Release History
+report.changes.label.type.add=Add
+report.changes.label.type.fix=Fix
+report.changes.label.type.remove=Remove
+report.changes.label.type.unknown=Unknown
+report.changes.label.type.update=Update
report.changes.text.no.changes=No changes in this release.
report.changes.text.rssfeed=Get the RSS feed of the last changes:
+report.changes.text.rssfeed.link=RSS
report.changes.text.rssfeed.description=These are the latest changes of this
project.
report.changes.text.thanx=Thanks to
report.changes.text.fixes=Fixes
diff --git a/src/main/resources/org/apache/maven/plugins/changes/images/add.gif
b/src/main/resources/org/apache/maven/plugins/changes/images/add.gif
deleted file mode 100644
index ac0bdcc..0000000
Binary files
a/src/main/resources/org/apache/maven/plugins/changes/images/add.gif and
/dev/null differ
diff --git a/src/main/resources/org/apache/maven/plugins/changes/images/fix.gif
b/src/main/resources/org/apache/maven/plugins/changes/images/fix.gif
deleted file mode 100644
index 2585f13..0000000
Binary files
a/src/main/resources/org/apache/maven/plugins/changes/images/fix.gif and
/dev/null differ
diff --git
a/src/main/resources/org/apache/maven/plugins/changes/images/icon_help_sml.gif
b/src/main/resources/org/apache/maven/plugins/changes/images/icon_help_sml.gif
deleted file mode 100644
index 43bfd56..0000000
Binary files
a/src/main/resources/org/apache/maven/plugins/changes/images/icon_help_sml.gif
and /dev/null differ
diff --git
a/src/main/resources/org/apache/maven/plugins/changes/images/remove.gif
b/src/main/resources/org/apache/maven/plugins/changes/images/remove.gif
deleted file mode 100644
index ad4b238..0000000
Binary files
a/src/main/resources/org/apache/maven/plugins/changes/images/remove.gif and
/dev/null differ
diff --git a/src/main/resources/org/apache/maven/plugins/changes/images/rss.png
b/src/main/resources/org/apache/maven/plugins/changes/images/rss.png
deleted file mode 100644
index d2b5af4..0000000
Binary files
a/src/main/resources/org/apache/maven/plugins/changes/images/rss.png and
/dev/null differ
diff --git
a/src/main/resources/org/apache/maven/plugins/changes/images/update.gif
b/src/main/resources/org/apache/maven/plugins/changes/images/update.gif
deleted file mode 100644
index 71ca225..0000000
Binary files
a/src/main/resources/org/apache/maven/plugins/changes/images/update.gif and
/dev/null differ