From 0444a54b0e97b9937578b6271155a07fc5182c33e314664679c7cbdcf6e05a13 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 24 Jul 2023 20:21:41 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-plugin-tools?expand=0&rev=32 --- maven-plugin-plugin-bootstrap.spec | 2 ++ maven-plugin-plugin.spec | 2 ++ maven-plugin-tools.spec | 2 ++ stringutils.patch | 11 +++++++++++ 4 files changed, 17 insertions(+) create mode 100644 stringutils.patch diff --git a/maven-plugin-plugin-bootstrap.spec b/maven-plugin-plugin-bootstrap.spec index 8d3c83c..1f9fe38 100644 --- a/maven-plugin-plugin-bootstrap.spec +++ b/maven-plugin-plugin-bootstrap.spec @@ -30,6 +30,7 @@ Source1: %{base_name}-build.tar.xz Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch Patch1: 0002-Deal-with-nulls-from-getComment.patch Patch2: 0003-Port-to-plexus-utils-3.0.24.patch +Patch3: stringutils.patch # The maven-plugin-plugin is used to generate those descriptors, which # creates a circular dependency of maven-plugin-plugin on itself. # We generated those ones outside the rpm build for a bootstrap package. @@ -70,6 +71,7 @@ artifact metadata and a generic help goal. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %patch20 -p1 %pom_remove_plugin -r :maven-enforcer-plugin diff --git a/maven-plugin-plugin.spec b/maven-plugin-plugin.spec index b643ac8..c75488e 100644 --- a/maven-plugin-plugin.spec +++ b/maven-plugin-plugin.spec @@ -28,6 +28,7 @@ Source0: http://repo2.maven.org/maven2/org/apache/maven/plugin-tools/%{ba Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch Patch1: 0002-Deal-with-nulls-from-getComment.patch Patch2: 0003-Port-to-plexus-utils-3.0.24.patch +Patch3: stringutils.patch BuildRequires: fdupes BuildRequires: maven-local BuildRequires: unzip @@ -78,6 +79,7 @@ API documentation for %{name}. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %pom_remove_plugin -r :maven-enforcer-plugin diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec index 3e8eecc..461a514 100644 --- a/maven-plugin-tools.spec +++ b/maven-plugin-tools.spec @@ -28,6 +28,7 @@ Source1: %{name}-build.tar.xz Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch Patch1: 0002-Deal-with-nulls-from-getComment.patch Patch2: 0003-Port-to-plexus-utils-3.0.24.patch +Patch3: stringutils.patch BuildRequires: ant BuildRequires: apache-commons-cli BuildRequires: atinject @@ -157,6 +158,7 @@ API documentation for %{name}. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %pom_remove_plugin -r :maven-enforcer-plugin diff --git a/stringutils.patch b/stringutils.patch new file mode 100644 index 0000000..4df99cb --- /dev/null +++ b/stringutils.patch @@ -0,0 +1,11 @@ +--- maven-plugin-tools-3.6.0/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java 2018-10-29 10:41:50.000000000 +0100 ++++ maven-plugin-tools-3.6.0/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java 2023-07-24 22:15:51.121414876 +0200 +@@ -292,7 +292,7 @@ + // cannot happen as every JVM must support UTF-8, see also class javadoc for java.nio.charset.Charset + } + +- if ( StringUtils.isEmpty( commentCleaned ) ) ++ if (commentCleaned == null || commentCleaned.isEmpty()) + { + return ""; + } From b361d763588901b8858bef542dc4681bf78feda4182dbbfda508fc7707419bf4 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 24 Jul 2023 20:37:07 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-plugin-tools?expand=0&rev=33 --- 0004-Remove-dependency-on-jtidy.patch | 92 +++++++++++++++++++++++++++ maven-plugin-plugin-bootstrap.spec | 2 +- maven-plugin-plugin.spec | 2 +- maven-plugin-tools.spec | 4 +- stringutils.patch | 11 ---- 5 files changed, 95 insertions(+), 16 deletions(-) create mode 100644 0004-Remove-dependency-on-jtidy.patch delete mode 100644 stringutils.patch diff --git a/0004-Remove-dependency-on-jtidy.patch b/0004-Remove-dependency-on-jtidy.patch new file mode 100644 index 0000000..437062d --- /dev/null +++ b/0004-Remove-dependency-on-jtidy.patch @@ -0,0 +1,92 @@ +From 6953b37ee5a7c0566d2e11e7141768f8a4c03fa2 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Mon, 27 Apr 2020 12:56:04 +0200 +Subject: [PATCH 2/3] Remove dependency on jtidy + +--- + .../plugin/generator/GeneratorUtils.java | 55 +------------------ + 1 file changed, 1 insertion(+), 54 deletions(-) + +diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java +index e9ec47fe..1393b507 100644 +--- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java ++++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java +@@ -52,7 +52,6 @@ import org.apache.maven.reporting.MavenReport; + import org.codehaus.plexus.component.repository.ComponentDependency; + import org.codehaus.plexus.util.StringUtils; + import org.codehaus.plexus.util.xml.XMLWriter; +-import org.w3c.tidy.Tidy; + + import static java.nio.charset.StandardCharsets.UTF_8; + +@@ -262,58 +261,6 @@ public final class GeneratorUtils + return decoded.toString(); + } + +- /** +- * Fixes some javadoc comment to become a valid XHTML snippet. +- * +- * @param description Javadoc description with HTML tags, may be null. +- * @return The description with valid XHTML tags, never null. +- */ +- public static String makeHtmlValid( String description ) +- { +- if ( StringUtils.isEmpty( description ) ) +- { +- return ""; +- } +- +- String commentCleaned = decodeJavadocTags( description ); +- +- // Using jTidy to clean comment +- Tidy tidy = new Tidy(); +- tidy.setDocType( "loose" ); +- tidy.setXHTML( true ); +- tidy.setXmlOut( true ); +- tidy.setInputEncoding( "UTF-8" ); +- tidy.setOutputEncoding( "UTF-8" ); +- tidy.setMakeClean( true ); +- tidy.setNumEntities( true ); +- tidy.setQuoteNbsp( false ); +- tidy.setQuiet( true ); +- tidy.setShowWarnings( false ); +- try +- { +- ByteArrayOutputStream out = new ByteArrayOutputStream( commentCleaned.length() + 256 ); +- tidy.parse( new ByteArrayInputStream( commentCleaned.getBytes( UTF_8 ) ), out ); +- commentCleaned = out.toString( "UTF-8" ); +- } +- catch ( UnsupportedEncodingException e ) +- { +- // cannot happen as every JVM must support UTF-8, see also class javadoc for java.nio.charset.Charset +- } +- +- if ( StringUtils.isEmpty( commentCleaned ) ) +- { +- return ""; +- } +- +- // strip the header/body stuff +- String ls = System.getProperty( "line.separator" ); +- int startPos = commentCleaned.indexOf( "" + ls ) + 6 + ls.length(); +- int endPos = commentCleaned.indexOf( ls + "" ); +- commentCleaned = commentCleaned.substring( startPos, endPos ); +- +- return commentCleaned; +- } +- + /** + * Converts a HTML fragment as extracted from a javadoc comment to a plain text string. This method tries to retain + * as much of the text formatting as possible by means of the following transformations: +@@ -345,7 +292,7 @@ public final class GeneratorUtils + + try + { +- parser.parse( new StringReader( makeHtmlValid( html ) ), htmlCallback, true ); ++ parser.parse( new StringReader( html ), htmlCallback, true ); + } + catch ( IOException e ) + { +-- +2.35.1 + diff --git a/maven-plugin-plugin-bootstrap.spec b/maven-plugin-plugin-bootstrap.spec index 1f9fe38..1894904 100644 --- a/maven-plugin-plugin-bootstrap.spec +++ b/maven-plugin-plugin-bootstrap.spec @@ -30,7 +30,7 @@ Source1: %{base_name}-build.tar.xz Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch Patch1: 0002-Deal-with-nulls-from-getComment.patch Patch2: 0003-Port-to-plexus-utils-3.0.24.patch -Patch3: stringutils.patch +Patch3: 0004-Remove-dependency-on-jtidy.patch # The maven-plugin-plugin is used to generate those descriptors, which # creates a circular dependency of maven-plugin-plugin on itself. # We generated those ones outside the rpm build for a bootstrap package. diff --git a/maven-plugin-plugin.spec b/maven-plugin-plugin.spec index c75488e..443667b 100644 --- a/maven-plugin-plugin.spec +++ b/maven-plugin-plugin.spec @@ -28,7 +28,7 @@ Source0: http://repo2.maven.org/maven2/org/apache/maven/plugin-tools/%{ba Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch Patch1: 0002-Deal-with-nulls-from-getComment.patch Patch2: 0003-Port-to-plexus-utils-3.0.24.patch -Patch3: stringutils.patch +Patch3: 0004-Remove-dependency-on-jtidy.patch BuildRequires: fdupes BuildRequires: maven-local BuildRequires: unzip diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec index 461a514..782c4a6 100644 --- a/maven-plugin-tools.spec +++ b/maven-plugin-tools.spec @@ -28,7 +28,7 @@ Source1: %{name}-build.tar.xz Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch Patch1: 0002-Deal-with-nulls-from-getComment.patch Patch2: 0003-Port-to-plexus-utils-3.0.24.patch -Patch3: stringutils.patch +Patch3: 0004-Remove-dependency-on-jtidy.patch BuildRequires: ant BuildRequires: apache-commons-cli BuildRequires: atinject @@ -39,7 +39,6 @@ BuildRequires: guava BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: jdom2 -BuildRequires: jtidy BuildRequires: junit BuildRequires: maven-lib BuildRequires: maven-reporting-api @@ -186,7 +185,6 @@ build-jar-repository -s lib \ guava/guava \ guice/google-guice-no_aop \ jdom2/jdom2 \ - jtidy \ junit \ maven/maven-artifact \ maven/maven-compat \ diff --git a/stringutils.patch b/stringutils.patch deleted file mode 100644 index 4df99cb..0000000 --- a/stringutils.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- maven-plugin-tools-3.6.0/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java 2018-10-29 10:41:50.000000000 +0100 -+++ maven-plugin-tools-3.6.0/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java 2023-07-24 22:15:51.121414876 +0200 -@@ -292,7 +292,7 @@ - // cannot happen as every JVM must support UTF-8, see also class javadoc for java.nio.charset.Charset - } - -- if ( StringUtils.isEmpty( commentCleaned ) ) -+ if (commentCleaned == null || commentCleaned.isEmpty()) - { - return ""; - } From d7957299ad11cabe07643c034eafa3c65b9634bed860f76050113a3ab563993a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 24 Jul 2023 21:00:04 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-plugin-tools?expand=0&rev=34 --- 0004-Remove-dependency-on-jtidy.patch | 87 ++++++++++++++------ maven-plugin-plugin-bootstrap-resouces.patch | 8 +- maven-plugin-tools.spec | 2 + 3 files changed, 65 insertions(+), 32 deletions(-) diff --git a/0004-Remove-dependency-on-jtidy.patch b/0004-Remove-dependency-on-jtidy.patch index 437062d..88b8fef 100644 --- a/0004-Remove-dependency-on-jtidy.patch +++ b/0004-Remove-dependency-on-jtidy.patch @@ -1,29 +1,17 @@ -From 6953b37ee5a7c0566d2e11e7141768f8a4c03fa2 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Mon, 27 Apr 2020 12:56:04 +0200 -Subject: [PATCH 2/3] Remove dependency on jtidy - ---- - .../plugin/generator/GeneratorUtils.java | 55 +------------------ - 1 file changed, 1 insertion(+), 54 deletions(-) - -diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java -index e9ec47fe..1393b507 100644 ---- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java -+++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java -@@ -52,7 +52,6 @@ import org.apache.maven.reporting.MavenReport; +--- maven-plugin-tools-3.6.0/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java 2018-10-29 10:41:50.000000000 +0100 ++++ maven-plugin-tools-3.6.0/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java 2023-07-24 22:39:51.914568518 +0200 +@@ -51,7 +51,6 @@ import org.codehaus.plexus.component.repository.ComponentDependency; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.XMLWriter; -import org.w3c.tidy.Tidy; - import static java.nio.charset.StandardCharsets.UTF_8; - -@@ -262,58 +261,6 @@ public final class GeneratorUtils - return decoded.toString(); + /** + * Convenience methods to play with Maven plugins. +@@ -255,58 +254,6 @@ } -- /** + /** - * Fixes some javadoc comment to become a valid XHTML snippet. - * - * @param description Javadoc description with HTML tags, may be null. @@ -53,7 +41,7 @@ index e9ec47fe..1393b507 100644 - try - { - ByteArrayOutputStream out = new ByteArrayOutputStream( commentCleaned.length() + 256 ); -- tidy.parse( new ByteArrayInputStream( commentCleaned.getBytes( UTF_8 ) ), out ); +- tidy.parse( new ByteArrayInputStream( commentCleaned.getBytes( "UTF-8" ) ), out ); - commentCleaned = out.toString( "UTF-8" ); - } - catch ( UnsupportedEncodingException e ) @@ -75,10 +63,11 @@ index e9ec47fe..1393b507 100644 - return commentCleaned; - } - - /** +- /** * Converts a HTML fragment as extracted from a javadoc comment to a plain text string. This method tries to retain * as much of the text formatting as possible by means of the following transformations: -@@ -345,7 +292,7 @@ public final class GeneratorUtils + *
    +@@ -337,7 +284,7 @@ try { @@ -87,6 +76,54 @@ index e9ec47fe..1393b507 100644 } catch ( IOException e ) { --- -2.35.1 - +--- maven-plugin-tools-3.6.0/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java 2018-10-29 10:41:50.000000000 +0100 ++++ maven-plugin-tools-3.6.0/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java 2023-07-24 22:49:33.765883927 +0200 +@@ -202,7 +202,7 @@ + w.writeMarkup( getString( "pluginxdoc.mojodescriptor.deprecated" ) ); + w.endElement(); // p + w.startElement( "div" ); +- w.writeMarkup( GeneratorUtils.makeHtmlValid( mojoDescriptor.getDeprecated() ) ); ++ w.writeMarkup( mojoDescriptor.getDeprecated() ); + w.endElement(); // div + } + +@@ -212,7 +212,7 @@ + w.startElement( "div" ); + if ( StringUtils.isNotEmpty( mojoDescriptor.getDescription() ) ) + { +- w.writeMarkup( GeneratorUtils.makeHtmlValid( mojoDescriptor.getDescription() ) ); ++ w.writeMarkup( mojoDescriptor.getDescription() ); + } + else + { +@@ -470,14 +470,14 @@ + { + w.startElement( "div" ); + w.writeMarkup( format( "pluginxdoc.mojodescriptor.parameter.deprecated", +- GeneratorUtils.makeHtmlValid( parameter.getDeprecated() ) ) ); ++ parameter.getDeprecated() ) ); + w.endElement(); // div + } + + w.startElement( "div" ); + if ( StringUtils.isNotEmpty( parameter.getDescription() ) ) + { +- w.writeMarkup( GeneratorUtils.makeHtmlValid( parameter.getDescription() ) ); ++ w.writeMarkup( parameter.getDescription() ); + } + else + { +@@ -689,11 +689,11 @@ + if ( StringUtils.isNotEmpty( parameter.getDeprecated() ) ) + { + description = format( "pluginxdoc.mojodescriptor.parameter.deprecated", +- GeneratorUtils.makeHtmlValid( parameter.getDeprecated() ) ); ++ parameter.getDeprecated() ); + } + else if ( StringUtils.isNotEmpty( parameter.getDescription() ) ) + { +- description = GeneratorUtils.makeHtmlValid( parameter.getDescription() ); ++ description = parameter.getDescription(); + } + else + { diff --git a/maven-plugin-plugin-bootstrap-resouces.patch b/maven-plugin-plugin-bootstrap-resouces.patch index d7ce652..9e7b301 100644 --- a/maven-plugin-plugin-bootstrap-resouces.patch +++ b/maven-plugin-plugin-bootstrap-resouces.patch @@ -388,7 +388,7 @@ + --- maven-plugin-tools-3.6.0/maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml 1970-01-01 01:00:00.000000000 +0100 +++ maven-plugin-tools-3.6.0/maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml 2019-11-25 11:05:03.978261704 +0100 -@@ -0,0 +1,1062 @@ +@@ -0,0 +1,1056 @@ + + + ${project.name} @@ -1168,12 +1168,6 @@ + 3.6.0 + + -+ net.sf.jtidy -+ jtidy -+ jar -+ r938 -+ -+ + xerces + dom3-xml-apis + jar diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec index 782c4a6..0ce1c09 100644 --- a/maven-plugin-tools.spec +++ b/maven-plugin-tools.spec @@ -170,6 +170,8 @@ API documentation for %{name}. %pom_change_dep org.easymock:easymock:: :::test maven-plugin-tools-annotations +%pom_remove_dep net.sf.jtidy:jtidy maven-plugin-tools-generators + %{mvn_package} :maven-plugin-tools __noinstall %{mvn_package} :maven-script __noinstall %{mvn_package} :{*} @1 From 5ce7cf0667c7c91ebde70c690ee173e78a24a3f89fbc21695ab4b40bbdbd20be Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 24 Jul 2023 21:07:10 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-plugin-tools?expand=0&rev=35 --- maven-plugin-plugin-bootstrap.changes | 6 ++++++ maven-plugin-plugin.changes | 6 ++++++ maven-plugin-tools.changes | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/maven-plugin-plugin-bootstrap.changes b/maven-plugin-plugin-bootstrap.changes index 4d5861b..24d69e5 100644 --- a/maven-plugin-plugin-bootstrap.changes +++ b/maven-plugin-plugin-bootstrap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 24 21:05:56 UTC 2023 - Fridrich Strba + +- Added patch: + * 0004-Remove-dependency-on-jtidy.patch + ------------------------------------------------------------------- Fri May 13 09:17:09 UTC 2022 - Fridrich Strba diff --git a/maven-plugin-plugin.changes b/maven-plugin-plugin.changes index eea0f08..a711806 100644 --- a/maven-plugin-plugin.changes +++ b/maven-plugin-plugin.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 24 21:05:56 UTC 2023 - Fridrich Strba + +- Added patch: + * 0004-Remove-dependency-on-jtidy.patch + ------------------------------------------------------------------- Mon Nov 25 10:29:02 UTC 2019 - Fridrich Strba diff --git a/maven-plugin-tools.changes b/maven-plugin-tools.changes index f06b3b8..6bbff83 100644 --- a/maven-plugin-tools.changes +++ b/maven-plugin-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 24 21:05:56 UTC 2023 - Fridrich Strba + +- Added patch: + * 0004-Remove-dependency-on-jtidy.patch + ------------------------------------------------------------------- Fri May 5 08:28:11 UTC 2023 - Fridrich Strba From 51323d43b07e3ce3f09b193fe43b0b3530c27f703ff40671ece2d0f9b9d6d003 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 24 Jul 2023 21:08:45 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-plugin-tools?expand=0&rev=36 --- 0004-Remove-dependency-on-jtidy.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/0004-Remove-dependency-on-jtidy.patch b/0004-Remove-dependency-on-jtidy.patch index 88b8fef..ff7be23 100644 --- a/0004-Remove-dependency-on-jtidy.patch +++ b/0004-Remove-dependency-on-jtidy.patch @@ -1,3 +1,19 @@ +--- maven-plugin-tools-3.6.0/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java 2018-10-29 10:41:50.000000000 +0100 ++++ maven-plugin-tools-3.6.0/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java 2023-07-24 23:08:19.511756145 +0200 +@@ -544,11 +544,11 @@ + { + description = + "" + getBundle( locale ).getString( "report.plugin.goal.deprecated" ) + " " +- + GeneratorUtils.makeHtmlValid( mojo.getDeprecated() ); ++ + mojo.getDeprecated(); + } + else if ( StringUtils.isNotEmpty( mojo.getDescription() ) ) + { +- description = GeneratorUtils.makeHtmlValid( mojo.getDescription() ); ++ description = mojo.getDescription(); + } + else + { --- maven-plugin-tools-3.6.0/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java 2018-10-29 10:41:50.000000000 +0100 +++ maven-plugin-tools-3.6.0/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java 2023-07-24 22:39:51.914568518 +0200 @@ -51,7 +51,6 @@