From 71f69466fcce093a112d3529c728b81ae6bec530 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Apr 2026 16:03:20 +0000 Subject: [PATCH 1/4] Bump org.jsoup:jsoup from 1.19.1 to 1.22.2 Bumps [org.jsoup:jsoup](https://github.com/jhy/jsoup) from 1.19.1 to 1.22.2. - [Release notes](https://github.com/jhy/jsoup/releases) - [Changelog](https://github.com/jhy/jsoup/blob/master/CHANGES.md) - [Commits](https://github.com/jhy/jsoup/compare/jsoup-1.19.1...jsoup-1.22.2) --- updated-dependencies: - dependency-name: org.jsoup:jsoup dependency-version: 1.22.2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 252c90b4..9243788b 100644 --- a/pom.xml +++ b/pom.xml @@ -243,7 +243,7 @@ org.jsoup jsoup - 1.19.1 + 1.22.2 org.ow2.asm From 2642f7c0775db463090ae9ee9e0add1d35e31250 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sun, 14 Jun 2026 23:19:26 +0200 Subject: [PATCH 2/4] Update JavadocBlockTagsToXhtmlConverterTest to use system line separator for consistency --- .../converter/JavadocBlockTagsToXhtmlConverterTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/JavadocBlockTagsToXhtmlConverterTest.java b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/JavadocBlockTagsToXhtmlConverterTest.java index 515dc27b..a611e48f 100644 --- a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/JavadocBlockTagsToXhtmlConverterTest.java +++ b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/JavadocBlockTagsToXhtmlConverterTest.java @@ -31,6 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; class JavadocBlockTagsToXhtmlConverterTest { + private static final String NL = System.lineSeparator(); private final ConverterContext context; private final JavadocBlockTagsToXhtmlConverter converter; private final JavadocInlineTagsToXhtmlConverter inlineTagsConverter; @@ -47,7 +48,7 @@ class JavadocBlockTagsToXhtmlConverterTest { @Test void see() { assertEquals( - "
See also: \"Some reference\"", + "
" + System.lineSeparator() + "See also: \"Some reference\"", converter.convert("see", "\"Some reference\"", context)); assertEquals( ", Example", @@ -57,7 +58,7 @@ void see() { ConverterContext context2 = new SimpleConverterContext("my.package", URI.create("https://javadoc.example.com/")); assertEquals( - "
See also: Example", + "
" + NL + "See also: Example", converter.convert("see", "Example", context2)); } From ed39c2fb18f98f5e1962cdbd9611f793602f88c2 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sun, 14 Jun 2026 23:52:11 +0200 Subject: [PATCH 3/4] Fix formatting in expected-help.txt for inline link consistency --- .../it/help-basic-deprecated-annotation-only/expected-help.txt | 2 +- maven-plugin-plugin/src/it/help-basic-jdk11/expected-help.txt | 2 +- maven-plugin-plugin/src/it/help-basic/expected-help.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/expected-help.txt b/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/expected-help.txt index d05f112a..c3aeb824 100644 --- a/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/expected-help.txt +++ b/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/expected-help.txt @@ -6,7 +6,7 @@ help-deprecated-annotation-only:test MOJO-DESCRIPTION. Some "quotation" marks and backslashes '\\', some important javadoc - and an inline link to test.AnotherMojo. + and an inline link to test.AnotherMojo . Available parameters: diff --git a/maven-plugin-plugin/src/it/help-basic-jdk11/expected-help.txt b/maven-plugin-plugin/src/it/help-basic-jdk11/expected-help.txt index 25875a0e..069f241b 100644 --- a/maven-plugin-plugin/src/it/help-basic-jdk11/expected-help.txt +++ b/maven-plugin-plugin/src/it/help-basic-jdk11/expected-help.txt @@ -6,7 +6,7 @@ help-jdk11:test MOJO-DESCRIPTION. Some "quotation" marks and backslashes '\\', some important javadoc - and an inline link to test.AnotherMojo. + and an inline link to test.AnotherMojo . Available parameters: diff --git a/maven-plugin-plugin/src/it/help-basic/expected-help.txt b/maven-plugin-plugin/src/it/help-basic/expected-help.txt index 68d99c2b..2bed0f0d 100644 --- a/maven-plugin-plugin/src/it/help-basic/expected-help.txt +++ b/maven-plugin-plugin/src/it/help-basic/expected-help.txt @@ -6,7 +6,7 @@ help:test MOJO-DESCRIPTION. Some "quotation" marks and backslashes '\\', some important javadoc - and an inline link to test.AnotherMojo. + and an inline link to test.AnotherMojo . Available parameters: From 8bda6e65c821339a19f520b7d73be97dda86cb0f Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Mon, 15 Jun 2026 00:53:10 +0200 Subject: [PATCH 4/4] Fix line separator usage in JavadocBlockTagsToXhtmlConverterTest for consistency --- .../converter/JavadocBlockTagsToXhtmlConverterTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/JavadocBlockTagsToXhtmlConverterTest.java b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/JavadocBlockTagsToXhtmlConverterTest.java index a611e48f..96dc3715 100644 --- a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/JavadocBlockTagsToXhtmlConverterTest.java +++ b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/JavadocBlockTagsToXhtmlConverterTest.java @@ -31,7 +31,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; class JavadocBlockTagsToXhtmlConverterTest { - private static final String NL = System.lineSeparator(); private final ConverterContext context; private final JavadocBlockTagsToXhtmlConverter converter; private final JavadocInlineTagsToXhtmlConverter inlineTagsConverter; @@ -48,7 +47,7 @@ class JavadocBlockTagsToXhtmlConverterTest { @Test void see() { assertEquals( - "
" + System.lineSeparator() + "See also: \"Some reference\"", + "
\nSee also: \"Some reference\"", converter.convert("see", "\"Some reference\"", context)); assertEquals( ", Example", @@ -58,7 +57,7 @@ void see() { ConverterContext context2 = new SimpleConverterContext("my.package", URI.create("https://javadoc.example.com/")); assertEquals( - "
" + NL + "See also: Example", + "
\nSee also: Example", converter.convert("see", "Example", context2)); }