From 0444a54b0e97b9937578b6271155a07fc5182c33e314664679c7cbdcf6e05a13 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 24 Jul 2023 20:21:41 +0000
Subject: [PATCH] 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 "";
+         }