You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2023/04/04 06:19:13 UTC
[maven-site-plugin] branch sitemap-fixes updated (94c2bfc0 -> 5731eb95)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch sitemap-fixes
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
discard 94c2bfc0 [MSITE-938] Sitemap creates empty entry if href is null although menu item name isn't
discard 9eae0dca [MSITE-937] Sitemap creates non-consecutive headings
add 5dca54bf [MSITE-934] Log output of site:run does not show locale
new e1c223ed [MSITE-937] Sitemap creates non-consecutive headings
new 5731eb95 [MSITE-938] Sitemap creates empty entry if href is null although menu item name isn't
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (94c2bfc0)
\
N -- N -- N refs/heads/sitemap-fixes (5731eb95)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/maven/plugins/site/run/DoxiaFilter.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
[maven-site-plugin] 02/02: [MSITE-938] Sitemap creates empty entry if href is null although menu item name isn't
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch sitemap-fixes
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 5731eb9537d26e78adaeec33b920a4473d569a30
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Apr 3 16:49:18 2023 +0200
[MSITE-938] Sitemap creates empty entry if href is null although menu item name isn't
---
src/main/java/org/apache/maven/plugins/site/render/SiteMap.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/maven/plugins/site/render/SiteMap.java b/src/main/java/org/apache/maven/plugins/site/render/SiteMap.java
index 7bc8b0ea..82cc6df8 100644
--- a/src/main/java/org/apache/maven/plugins/site/render/SiteMap.java
+++ b/src/main/java/org/apache/maven/plugins/site/render/SiteMap.java
@@ -155,7 +155,9 @@ public class SiteMap {
sink.listItem();
if (item.getHref() != null) {
sink.link(relativePath(item.getHref()));
- sink.text(item.getName());
+ }
+ sink.text(item.getName());
+ if (item.getHref() != null) {
sink.link_();
}
[maven-site-plugin] 01/02: [MSITE-937] Sitemap creates non-consecutive headings
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch sitemap-fixes
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit e1c223edb0d0bab7b25d57094a17f03a0e8277b3
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Apr 3 16:48:40 2023 +0200
[MSITE-937] Sitemap creates non-consecutive headings
---
src/main/java/org/apache/maven/plugins/site/render/SiteMap.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/site/render/SiteMap.java b/src/main/java/org/apache/maven/plugins/site/render/SiteMap.java
index 890273a6..7bc8b0ea 100644
--- a/src/main/java/org/apache/maven/plugins/site/render/SiteMap.java
+++ b/src/main/java/org/apache/maven/plugins/site/render/SiteMap.java
@@ -129,15 +129,15 @@ public class SiteMap {
sink.paragraph_();
for (Menu menu : decoration.getMenus()) {
- sink.section3();
- sink.sectionTitle3();
+ sink.section2();
+ sink.sectionTitle2();
sink.text(menu.getName());
- sink.sectionTitle3_();
+ sink.sectionTitle2_();
sink.horizontalRule();
extractItems(menu.getItems(), sink);
- sink.section3_();
+ sink.section2_();
}
sink.section1_();