From fa476c3dd07ea002cc24d1771a572dd48a4c862f399f88ccb1a8fe48e71359d6 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 22 Sep 2023 15:27:50 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven-plugin-tools?expand=0&rev=46

---
 maven-plugin-plugin-bootstrap-resouces.patch | 142 ++++++++-----------
 1 file changed, 57 insertions(+), 85 deletions(-)

diff --git a/maven-plugin-plugin-bootstrap-resouces.patch b/maven-plugin-plugin-bootstrap-resouces.patch
index 3f0d357..32f6c3d 100644
--- a/maven-plugin-plugin-bootstrap-resouces.patch
+++ b/maven-plugin-plugin-bootstrap-resouces.patch
@@ -1,5 +1,5 @@
 --- maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-plugin-plugin/plugin-help.xml	1970-01-01 01:00:00.000000000 +0100
-+++ maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-plugin-plugin/plugin-help.xml	2023-09-22 11:45:44.683625545 +0200
++++ maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-plugin-plugin/plugin-help.xml	2023-09-22 17:01:23.758467077 +0200
 @@ -0,0 +1,345 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<plugin>
@@ -347,8 +347,8 @@
 +  </mojos>
 +</plugin>
 --- maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml	1970-01-01 01:00:00.000000000 +0100
-+++ maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml	2023-09-22 11:47:11.690874190 +0200
-@@ -0,0 +1,648 @@
++++ maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml	2023-09-22 17:02:25.238892040 +0200
+@@ -0,0 +1,618 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<plugin>
 +  <name>${project.name}</name>
@@ -780,6 +780,18 @@
 +      <version>3.9.0</version>
 +    </dependency>
 +    <dependency>
++      <groupId>org.apache.maven.wagon</groupId>
++      <artifactId>wagon-provider-api</artifactId>
++      <type>jar</type>
++      <version>2.4</version>
++    </dependency>
++    <dependency>
++      <groupId>org.codehaus.plexus</groupId>
++      <artifactId>plexus-java</artifactId>
++      <type>jar</type>
++      <version>1.1.2</version>
++    </dependency>
++    <dependency>
 +      <groupId>org.apache.httpcomponents</groupId>
 +      <artifactId>httpclient</artifactId>
 +      <type>jar</type>
@@ -804,24 +816,36 @@
 +      <version>4.4.16</version>
 +    </dependency>
 +    <dependency>
-+      <groupId>org.apache.maven.wagon</groupId>
-+      <artifactId>wagon-provider-api</artifactId>
-+      <type>jar</type>
-+      <version>2.4</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.codehaus.plexus</groupId>
-+      <artifactId>plexus-java</artifactId>
-+      <type>jar</type>
-+      <version>1.1.2</version>
-+    </dependency>
-+    <dependency>
 +      <groupId>org.apache.maven.plugin-tools</groupId>
 +      <artifactId>maven-plugin-tools-generators</artifactId>
 +      <type>jar</type>
 +      <version>3.9.0</version>
 +    </dependency>
 +    <dependency>
++      <groupId>org.ow2.asm</groupId>
++      <artifactId>asm</artifactId>
++      <type>jar</type>
++      <version>9.5</version>
++    </dependency>
++    <dependency>
++      <groupId>org.ow2.asm</groupId>
++      <artifactId>asm-commons</artifactId>
++      <type>jar</type>
++      <version>9.5</version>
++    </dependency>
++    <dependency>
++      <groupId>org.ow2.asm</groupId>
++      <artifactId>asm-tree</artifactId>
++      <type>jar</type>
++      <version>9.5</version>
++    </dependency>
++    <dependency>
++      <groupId>org.jsoup</groupId>
++      <artifactId>jsoup</artifactId>
++      <type>jar</type>
++      <version>1.16.1</version>
++    </dependency>
++    <dependency>
 +      <groupId>org.apache.maven.reporting</groupId>
 +      <artifactId>maven-reporting-api</artifactId>
 +      <type>jar</type>
@@ -852,36 +876,6 @@
 +      <version>2.4</version>
 +    </dependency>
 +    <dependency>
-+      <groupId>org.ow2.asm</groupId>
-+      <artifactId>asm</artifactId>
-+      <type>jar</type>
-+      <version>9.5</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.ow2.asm</groupId>
-+      <artifactId>asm-commons</artifactId>
-+      <type>jar</type>
-+      <version>9.5</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.ow2.asm</groupId>
-+      <artifactId>asm-tree</artifactId>
-+      <type>jar</type>
-+      <version>9.5</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.jsoup</groupId>
-+      <artifactId>jsoup</artifactId>
-+      <type>jar</type>
-+      <version>1.16.1</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>net.sf.jtidy</groupId>
-+      <artifactId>jtidy</artifactId>
-+      <type>jar</type>
-+      <version>r938</version>
-+    </dependency>
-+    <dependency>
 +      <groupId>org.apache.maven.plugin-tools</groupId>
 +      <artifactId>maven-plugin-tools-java</artifactId>
 +      <type>jar</type>
@@ -900,6 +894,18 @@
 +      <version>3.9.0</version>
 +    </dependency>
 +    <dependency>
++      <groupId>org.ow2.asm</groupId>
++      <artifactId>asm-util</artifactId>
++      <type>jar</type>
++      <version>9.5</version>
++    </dependency>
++    <dependency>
++      <groupId>org.ow2.asm</groupId>
++      <artifactId>asm-analysis</artifactId>
++      <type>jar</type>
++      <version>9.5</version>
++    </dependency>
++    <dependency>
 +      <groupId>org.codehaus.plexus</groupId>
 +      <artifactId>plexus-archiver</artifactId>
 +      <type>jar</type>
@@ -930,48 +936,12 @@
 +      <version>1.23.0</version>
 +    </dependency>
 +    <dependency>
-+      <groupId>org.ow2.asm</groupId>
-+      <artifactId>asm-util</artifactId>
-+      <type>jar</type>
-+      <version>9.5</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.ow2.asm</groupId>
-+      <artifactId>asm-analysis</artifactId>
-+      <type>jar</type>
-+      <version>9.5</version>
-+    </dependency>
-+    <dependency>
 +      <groupId>org.apache.maven.plugin-tools</groupId>
 +      <artifactId>maven-plugin-annotations</artifactId>
 +      <type>jar</type>
 +      <version>3.9.0</version>
 +    </dependency>
 +    <dependency>
-+      <groupId>org.apache.maven.plugin-tools</groupId>
-+      <artifactId>maven-plugin-tools-ant</artifactId>
-+      <type>jar</type>
-+      <version>3.9.0</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.apache.maven.plugin-tools</groupId>
-+      <artifactId>maven-plugin-tools-model</artifactId>
-+      <type>jar</type>
-+      <version>3.9.0</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.apache.maven.plugin-tools</groupId>
-+      <artifactId>maven-plugin-tools-beanshell</artifactId>
-+      <type>jar</type>
-+      <version>3.9.0</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.apache-extras.beanshell</groupId>
-+      <artifactId>bsh</artifactId>
-+      <type>jar</type>
-+      <version>2.0b6</version>
-+    </dependency>
-+    <dependency>
 +      <groupId>org.codehaus.plexus</groupId>
 +      <artifactId>plexus-utils</artifactId>
 +      <type>jar</type>
@@ -998,8 +968,8 @@
 +  </dependencies>
 +</plugin>
 --- maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpMojo.java	1970-01-01 01:00:00.000000000 +0100
-+++ maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpMojo.java	2023-09-22 11:43:46.469501488 +0200
-@@ -0,0 +1,446 @@
++++ maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpMojo.java	2023-09-22 16:49:32.513552812 +0200
+@@ -0,0 +1,448 @@
 +package org.apache.maven.plugins.maven_plugin_plugin;
 +
 +import org.apache.maven.plugin.AbstractMojo;
@@ -1282,7 +1252,9 @@
 +            append( sb, "Deprecated. " + deprecated.getTextContent(), 3 );
 +            append( sb, "", 0 );
 +        }
-+        append( sb, parameterDescription, 3 );
++        if ( isNotEmpty( parameterDescription ) ) {
++            append( sb, parameterDescription, 3 );
++        }
 +        if ( "true".equals( getValue( parameter, "required" ) ) )
 +        {
 +            append( sb, "Required: Yes", 3 );
@@ -1433,7 +1405,7 @@
 +        }
 +        return level;
 +    }
-+    
++
 +    private static String getPropertyFromExpression( String expression )
 +    {
 +        if ( expression != null && expression.startsWith( "${" ) && expression.endsWith( "}" )