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-doxia-sitetools.git
The following commit(s) were added to refs/heads/master by this push:
new 79bf424 Bump org.apache.maven:maven-parent from 43 to 45
79bf424 is described below
commit 79bf4248d61abea49aa08fdabf8c52dfd2b2fe54
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Sun Sep 28 10:27:53 2025 +0000
Bump org.apache.maven:maven-parent from 43 to 45
Bumps
[org.apache.maven:maven-parent](https://github.com/apache/maven-parent) from 43
to 45.
- [Release notes](https://github.com/apache/maven-parent/releases)
- [Commits](https://github.com/apache/maven-parent/commits)
---
updated-dependencies:
- dependency-name: org.apache.maven:maven-parent
dependency-version: '45'
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <[email protected]>
---
.../org/apache/maven/doxia/tools/SiteToolTest.java | 8 +++---
.../doxia/siterenderer/AttributesVerifier.java | 23 ++++++++--------
.../maven/doxia/siterenderer/FaqVerifier.java | 31 ++++++++++------------
.../doxia/siterenderer/NestedItemsVerifier.java | 1 +
pom.xml | 2 +-
5 files changed, 31 insertions(+), 34 deletions(-)
diff --git
a/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
b/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
index 6cd6a75..5a20f64 100644
---
a/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
+++
b/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
@@ -217,13 +217,13 @@ class SiteToolTest {
+ "site.xml");
project = new SiteToolMavenProjectStub("site-tool-locales-test/full");
- final Locale BAVARIAN = new Locale("de", "DE", "BY");
+ Locale bavarian = new Locale("de", "DE", "BY");
assertEquals(
tool.getSiteDescriptor(new File(project.getBasedir(),
"src/site"), SiteTool.DEFAULT_LOCALE)
.toString(),
project.getBasedir() + File.separator + "src" + File.separator
+ "site" + File.separator + "site.xml");
assertEquals(
- tool.getSiteDescriptor(new File(project.getBasedir(),
"src/site"), BAVARIAN)
+ tool.getSiteDescriptor(new File(project.getBasedir(),
"src/site"), bavarian)
.toString(),
project.getBasedir() + File.separator + "src" + File.separator
+ "site" + File.separator
+ "site_de_DE_BY.xml");
@@ -246,7 +246,7 @@ class SiteToolTest {
.toString(),
project.getBasedir() + File.separator + "src" + File.separator
+ "site" + File.separator + "site.xml");
assertEquals(
- tool.getSiteDescriptor(new File(project.getBasedir(),
"src/site"), BAVARIAN)
+ tool.getSiteDescriptor(new File(project.getBasedir(),
"src/site"), bavarian)
.toString(),
project.getBasedir() + File.separator + "src" + File.separator
+ "site" + File.separator
+ "site_de_DE.xml");
@@ -270,7 +270,7 @@ class SiteToolTest {
.toString(),
project.getBasedir() + File.separator + "src" + File.separator
+ "site" + File.separator + "site.xml");
assertEquals(
- tool.getSiteDescriptor(new File(project.getBasedir(),
"src/site"), BAVARIAN)
+ tool.getSiteDescriptor(new File(project.getBasedir(),
"src/site"), bavarian)
.toString(),
project.getBasedir() + File.separator + "src" + File.separator
+ "site" + File.separator
+ "site_de.xml");
diff --git
a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
index e0badc5..b172055 100644
---
a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
+++
b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
@@ -37,9 +37,7 @@ import org.htmlunit.html.HtmlSection;
import org.htmlunit.html.HtmlSubscript;
import org.htmlunit.html.HtmlSuperscript;
import org.htmlunit.html.HtmlTable;
-import org.htmlunit.html.HtmlTableDataCell;
import org.htmlunit.html.HtmlTableHeaderCell;
-import org.htmlunit.html.HtmlTableRow;
import org.htmlunit.html.HtmlUnderlined;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -52,6 +50,7 @@ import static org.junit.jupiter.api.Assertions.assertSame;
*
* @author ltheussl
*/
+@SuppressWarnings("MethodLength")
public class AttributesVerifier extends AbstractVerifier {
/** {@inheritDoc} */
public void verify(String file) throws Exception {
@@ -106,24 +105,24 @@ public class AttributesVerifier extends AbstractVerifier {
// this is a htmlunit bug
assertEquals("tbody", element.getTagName());
- HtmlTableRow tr = (HtmlTableRow) elementIterator.next();
- HtmlTableHeaderCell th = (HtmlTableHeaderCell) elementIterator.next();
+ elementIterator.next(); // tr
+ elementIterator.next(); // tableheadercell
- th = (HtmlTableHeaderCell) elementIterator.next();
+ HtmlTableHeaderCell th = (HtmlTableHeaderCell) elementIterator.next();
assertEquals("text-align: center; width: 50%;",
th.getAttribute("style"));
assertEquals("2", th.getAttribute("colspan"));
- tr = (HtmlTableRow) elementIterator.next();
+ elementIterator.next(); // tr
th = (HtmlTableHeaderCell) elementIterator.next();
assertEquals("2", th.getAttribute("rowspan"));
assertEquals("vertical-align: middle;", th.getAttribute("style"));
- HtmlTableDataCell td = (HtmlTableDataCell) elementIterator.next();
- td = (HtmlTableDataCell) elementIterator.next();
- tr = (HtmlTableRow) elementIterator.next();
- td = (HtmlTableDataCell) elementIterator.next();
- td = (HtmlTableDataCell) elementIterator.next();
+ elementIterator.next(); // td
+ elementIterator.next(); // td
+ elementIterator.next(); // tr
+ elementIterator.next(); // td
+ elementIterator.next(); // td
p = (HtmlParagraph) elementIterator.next();
assertNotNull(p);
@@ -214,7 +213,7 @@ public class AttributesVerifier extends AbstractVerifier {
a = (HtmlAnchor) elementIterator.next();
assertEquals("subsection-id", a.getAttribute("id"));
- section = (HtmlSection) elementIterator.next();
+ elementIterator.next(); // section
anchor = (HtmlAnchor) elementIterator.next();
assertNotNull(anchor);
assertEquals("Subsection_with_id", anchor.getAttribute("id"));
diff --git
a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java
b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java
index 40ac0ba..8958dad 100644
---
a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java
+++
b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java
@@ -22,8 +22,6 @@ import java.util.Iterator;
import org.htmlunit.html.HtmlAnchor;
import org.htmlunit.html.HtmlCode;
-import org.htmlunit.html.HtmlDefinitionDescription;
-import org.htmlunit.html.HtmlDefinitionList;
import org.htmlunit.html.HtmlDefinitionTerm;
import org.htmlunit.html.HtmlElement;
import org.htmlunit.html.HtmlHeading1;
@@ -31,9 +29,7 @@ import org.htmlunit.html.HtmlListItem;
import org.htmlunit.html.HtmlMain;
import org.htmlunit.html.HtmlOrderedList;
import org.htmlunit.html.HtmlPage;
-import org.htmlunit.html.HtmlParagraph;
import org.htmlunit.html.HtmlPreformattedText;
-import org.htmlunit.html.HtmlSection;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -43,6 +39,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
*
* @author ltheussl
*/
+@SuppressWarnings("MethodLength")
public class FaqVerifier extends AbstractVerifier {
/** {@inheritDoc} */
public void verify(String file) throws Exception {
@@ -60,7 +57,7 @@ public class FaqVerifier extends AbstractVerifier {
//
//
----------------------------------------------------------------------
- HtmlSection section = (HtmlSection) elementIterator.next();
+ elementIterator.next(); // section
HtmlAnchor a = (HtmlAnchor) elementIterator.next();
assertEquals("top", a.getAttribute("id"));
@@ -68,7 +65,7 @@ public class FaqVerifier extends AbstractVerifier {
HtmlHeading1 h1 = (HtmlHeading1) elementIterator.next();
assertEquals("Often Asked Questions", h1.asNormalizedText().trim());
- HtmlParagraph p = (HtmlParagraph) elementIterator.next();
+ elementIterator.next(); // p
element = elementIterator.next();
assertEquals("b", element.getTagName());
assertEquals("Contributing", element.asNormalizedText().trim());
@@ -90,7 +87,7 @@ public class FaqVerifier extends AbstractVerifier {
assertEquals("b", element.getTagName());
assertEquals("stupid", element.asNormalizedText().trim());
- p = (HtmlParagraph) elementIterator.next();
+ elementIterator.next(); // p
element = elementIterator.next();
assertEquals("b", element.getTagName());
assertEquals("Using Maven", element.asNormalizedText().trim());
@@ -109,7 +106,7 @@ public class FaqVerifier extends AbstractVerifier {
a = (HtmlAnchor) elementIterator.next();
assertEquals("#disable-reports", a.getAttribute("href"));
- section = (HtmlSection) elementIterator.next();
+ elementIterator.next(); // section
a = (HtmlAnchor) elementIterator.next();
assertEquals("contributing", a.getAttribute("id"));
@@ -117,7 +114,7 @@ public class FaqVerifier extends AbstractVerifier {
h1 = (HtmlHeading1) elementIterator.next();
assertEquals("Contributing", h1.asNormalizedText().trim());
- HtmlDefinitionList dl = (HtmlDefinitionList) elementIterator.next();
+ elementIterator.next(); // dl
a = (HtmlAnchor) elementIterator.next();
assertEquals("stupid-question", a.getAttribute("id"));
@@ -130,9 +127,9 @@ public class FaqVerifier extends AbstractVerifier {
assertEquals("b", element.getTagName());
assertEquals("stupid", element.asNormalizedText().trim());
- HtmlDefinitionDescription dd = (HtmlDefinitionDescription)
elementIterator.next();
+ elementIterator.next(); // dd
- p = (HtmlParagraph) elementIterator.next();
+ elementIterator.next(); // p
a = (HtmlAnchor) elementIterator.next();
assertEquals("#using", a.getAttribute("href"));
@@ -154,13 +151,13 @@ public class FaqVerifier extends AbstractVerifier {
assertEquals("b", element.getTagName());
assertEquals("non-US-ASCII characters: àéèç",
element.asNormalizedText().trim());
- p = (HtmlParagraph) elementIterator.next();
+ elementIterator.next(); // p
a = (HtmlAnchor) elementIterator.next();
assertEquals("#top", a.getAttribute("href"));
assertEquals("[top]", a.asNormalizedText().trim());
- section = (HtmlSection) elementIterator.next();
+ elementIterator.next(); // section
a = (HtmlAnchor) elementIterator.next();
assertEquals("using", a.getAttribute("id"));
@@ -168,7 +165,7 @@ public class FaqVerifier extends AbstractVerifier {
h1 = (HtmlHeading1) elementIterator.next();
assertEquals("Using Maven", h1.asNormalizedText().trim());
- dl = (HtmlDefinitionList) elementIterator.next();
+ elementIterator.next(); // dl
a = (HtmlAnchor) elementIterator.next();
assertEquals("disable-reports", a.getAttribute("id"));
@@ -178,9 +175,9 @@ public class FaqVerifier extends AbstractVerifier {
"How do I disable a report on my site?",
dt.getFirstChild().asNormalizedText().trim());
- dd = (HtmlDefinitionDescription) elementIterator.next();
+ elementIterator.next(); // dd
- p = (HtmlParagraph) elementIterator.next();
+ elementIterator.next(); // p
element = elementIterator.next();
assertEquals("code", element.getTagName());
@@ -191,7 +188,7 @@ public class FaqVerifier extends AbstractVerifier {
HtmlCode code = (HtmlCode) elementIterator.next();
assertEquals("<source>1.5</source>", code.asNormalizedText().trim());
- p = (HtmlParagraph) elementIterator.next();
+ elementIterator.next(); // p
a = (HtmlAnchor) elementIterator.next();
assertEquals("#top", a.getAttribute("href"));
diff --git
a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/NestedItemsVerifier.java
b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/NestedItemsVerifier.java
index 5fa80d9..95ddfa2 100644
---
a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/NestedItemsVerifier.java
+++
b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/NestedItemsVerifier.java
@@ -43,6 +43,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
*
* @author ltheussl
*/
+@SuppressWarnings("MethodLength")
public class NestedItemsVerifier extends AbstractVerifier {
/** {@inheritDoc} */
public void verify(String file) throws Exception {
diff --git a/pom.xml b/pom.xml
index 4a5b034..1ac0059 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>43</version>
+ <version>45</version>
<relativePath />
</parent>