pool/maven-plugin-tools
SHA256
5
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-plugin-tools?expand=0&rev=32

Browse Source
This commit is contained in:
Fridrich Strba 2023-07-24 20:21:41 +00:00 committed by Git OBS Bridge
parent 27051de884
commit 7a04d08d98
4 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-plugin-plugin-bootstrap.spec
View File

@ -30,6 +30,7 @@ Source1: %{base_name}-build.tar.xz
Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch
Patch1: 0002-Deal-with-nulls-from-getComment.patch Patch1: 0002-Deal-with-nulls-from-getComment.patch
Patch2: 0003-Port-to-plexus-utils-3.0.24.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 # The maven-plugin-plugin is used to generate those descriptors, which
# creates a circular dependency of maven-plugin-plugin on itself. # creates a circular dependency of maven-plugin-plugin on itself.
# We generated those ones outside the rpm build for a bootstrap package. # 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 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
%patch20 -p1 %patch20 -p1
%pom_remove_plugin -r :maven-enforcer-plugin %pom_remove_plugin -r :maven-enforcer-plugin

2
maven-plugin-plugin.spec
View File

@ -28,6 +28,7 @@ Source0: http://repo2.maven.org/maven2/org/apache/maven/plugin-tools/%{ba
Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch
Patch1: 0002-Deal-with-nulls-from-getComment.patch Patch1: 0002-Deal-with-nulls-from-getComment.patch
Patch2: 0003-Port-to-plexus-utils-3.0.24.patch Patch2: 0003-Port-to-plexus-utils-3.0.24.patch
Patch3: stringutils.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: unzip BuildRequires: unzip
@ -78,6 +79,7 @@ API documentation for %{name}.
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
%pom_remove_plugin -r :maven-enforcer-plugin %pom_remove_plugin -r :maven-enforcer-plugin

2
maven-plugin-tools.spec
View File

@ -28,6 +28,7 @@ Source1: %{name}-build.tar.xz
Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch
Patch1: 0002-Deal-with-nulls-from-getComment.patch Patch1: 0002-Deal-with-nulls-from-getComment.patch
Patch2: 0003-Port-to-plexus-utils-3.0.24.patch Patch2: 0003-Port-to-plexus-utils-3.0.24.patch
Patch3: stringutils.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: apache-commons-cli BuildRequires: apache-commons-cli
BuildRequires: atinject BuildRequires: atinject
@ -157,6 +158,7 @@ API documentation for %{name}.
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
%pom_remove_plugin -r :maven-enforcer-plugin %pom_remove_plugin -r :maven-enforcer-plugin

11
stringutils.patch Normal file
View File

@ -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 "";
}