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

0001-Avoid-duplicate-MOJO-parameters.patch

@@ -1,68 +0,0 @@
-From 0ebe12503766c6a76c507498e9e7f0cb1c4469c2 Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek@redhat.com>
-Date: Mon, 16 Mar 2015 14:29:21 +0100
-Subject: [PATCH 1/3] Avoid duplicate MOJO parameters
-
----
- .../JavaAnnotationsMojoDescriptorExtractor.java    | 24 ++++++++++++++++++++--
- 1 file changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java
-index 587ddad..231ed12 100644
---- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java
-+++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java
-@@ -29,6 +29,7 @@ import java.util.Collection;
- import java.util.Collections;
- import java.util.HashMap;
- import java.util.HashSet;
-+import java.util.Iterator;
- import java.util.List;
- import java.util.Map;
- import java.util.Set;
-@@ -573,7 +574,7 @@ public class JavaAnnotationsMojoDescriptorExtractor
-                 parameter.setSince( parameterAnnotationContent.getSince() );
-                 parameter.setRequired( parameterAnnotationContent.required() );
- 
--                mojoDescriptor.addParameter( parameter );
-+                addParameter( mojoDescriptor, parameter );
-             }
- 
-             // Component annotations
-@@ -614,7 +615,7 @@ public class JavaAnnotationsMojoDescriptorExtractor
-                 //parameter.setRequired( ... );
-                 parameter.setEditable( false );
- 
--                mojoDescriptor.addParameter( parameter );
-+                addParameter( mojoDescriptor, parameter );
-             }
- 
-             mojoDescriptor.setPluginDescriptor( pluginDescriptor );
-@@ -624,6 +625,25 @@ public class JavaAnnotationsMojoDescriptorExtractor
-         return mojoDescriptors;
-     }
- 
-+    private void addParameter( ExtendedMojoDescriptor mojoDescriptor,
-+                               org.apache.maven.plugin.descriptor.Parameter parameter )
-+        throws DuplicateParameterException
-+    {
-+        if ( mojoDescriptor.getParameters() != null )
-+        {
-+            for ( Iterator<?> it = mojoDescriptor.getParameters().iterator(); it.hasNext(); )
-+            {
-+                if ( it.next().equals( parameter ) )
-+                {
-+                    getLogger().warn( "Duplicate parameter " + parameter.getName() + " field in MOJO descriptor" );
-+                    it.remove();
-+                }
-+            }
-+        }
-+
-+        mojoDescriptor.addParameter( parameter );
-+    }
-+
-     protected ExecuteAnnotationContent findExecuteInParentHierarchy( MojoAnnotatedClass mojoAnnotatedClass,
-                                                                  Map<String, MojoAnnotatedClass> mojoAnnotatedClasses )
-     {
--- 
-2.14.3
-

0002-Deal-with-nulls-from-getComment.patch

@@ -1,66 +0,0 @@
-From ea64c5b59f5f820a73ab3e82b6898762e55a8719 Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek@redhat.com>
-Date: Mon, 16 Mar 2015 16:42:20 +0100
-Subject: [PATCH 2/3] Deal with nulls from getComment
-
----
- .../annotations/JavaAnnotationsMojoDescriptorExtractor.java         | 6 +++---
- .../extractor/javadoc/JavaJavadocMojoDescriptorExtractor.java       | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java
-index 231ed12..6ac677b 100644
---- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java
-+++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java
-@@ -269,7 +269,7 @@ public class JavaAnnotationsMojoDescriptorExtractor
-             MojoAnnotationContent mojoAnnotationContent = entry.getValue().getMojo();
-             if ( mojoAnnotationContent != null )
-             {
--                mojoAnnotationContent.setDescription( javaClass.getComment() );
-+                mojoAnnotationContent.setDescription( javaClass.getComment() != null ? javaClass.getComment() : "" );
- 
-                 DocletTag since = findInClassHierarchy( javaClass, "since" );
-                 if ( since != null )
-@@ -300,7 +300,7 @@ public class JavaAnnotationsMojoDescriptorExtractor
-                 }
- 
-                 ParameterAnnotationContent parameterAnnotationContent = parameter.getValue();
--                parameterAnnotationContent.setDescription( javaField.getComment() );
-+                parameterAnnotationContent.setDescription( javaClass.getComment() != null ? javaClass.getComment() : "" );
- 
-                 DocletTag deprecated = javaField.getTagByName( "deprecated" );
-                 if ( deprecated != null )
-@@ -326,7 +326,7 @@ public class JavaAnnotationsMojoDescriptorExtractor
-                 }
- 
-                 ComponentAnnotationContent componentAnnotationContent = component.getValue();
--                componentAnnotationContent.setDescription( javaField.getComment() );
-+                componentAnnotationContent.setDescription( javaClass.getComment() != null ? javaClass.getComment() : "" );
- 
-                 DocletTag deprecated = javaField.getTagByName( "deprecated" );
-                 if ( deprecated != null )
-diff --git a/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaJavadocMojoDescriptorExtractor.java b/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaJavadocMojoDescriptorExtractor.java
-index 137d90d..36b30dc 100644
---- a/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaJavadocMojoDescriptorExtractor.java
-+++ b/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaJavadocMojoDescriptorExtractor.java
-@@ -115,7 +115,7 @@ public class JavaJavadocMojoDescriptorExtractor
-         ExtendedMojoDescriptor mojoDescriptor = new ExtendedMojoDescriptor();
-         mojoDescriptor.setLanguage( "java" );
-         mojoDescriptor.setImplementation( javaClass.getFullyQualifiedName() );
--        mojoDescriptor.setDescription( javaClass.getComment() );
-+        mojoDescriptor.setDescription( javaClass.getComment() != null ? javaClass.getComment() : "" );
- 
-         // ----------------------------------------------------------------------
-         // Mojo annotations in alphabetical order
-@@ -392,7 +392,7 @@ public class JavaJavadocMojoDescriptorExtractor
- 
-             pd.setType( type.getFullyQualifiedName() );
- 
--            pd.setDescription( field.getComment() );
-+            pd.setDescription( javaClass.getComment() != null ? javaClass.getComment() : "" );
- 
-             DocletTag deprecationTag = field.getTagByName( JavadocMojoAnnotation.DEPRECATED );
- 
--- 
-2.14.3
-

0002-Remove-dependency-on-jtidy.patch

@@ -0,0 +1,106 @@
+From 6953b37ee5a7c0566d2e11e7141768f8a4c03fa2 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Mon, 27 Apr 2020 12:56:04 +0200
+Subject: [PATCH 2/3] Remove dependency on jtidy
+
+Forwarded: not-needed
+
+---
+ .../plugin/generator/GeneratorUtils.java      | 49 +------------------
+ .../PluginDescriptorFilesGenerator.java       |  7 +--
+ 2 files changed, 2 insertions(+), 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 99aa7965..f05fb876 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
+@@ -51,7 +51,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;
+ 
+ /**
+  * Convenience methods to play with Maven plugins.
+@@ -225,52 +224,6 @@ public final class GeneratorUtils {
+     }
+ 
+     /**
+-     * Fixes some javadoc comment to become a valid XHTML snippet.
+-     *
+-     * @param description Javadoc description with HTML tags, may be <code>null</code>.
+-     * @return The description with valid XHTML tags, never <code>null</code>.
+-     * @deprecated Redundant for java extractor
+-     */
+-    @Deprecated
+-    public static String makeHtmlValid(String description) {
+-
+-        if (description == null || description.isEmpty()) {
+-            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(true);
+-
+-        ByteArrayOutputStream out = new ByteArrayOutputStream(commentCleaned.length() + 256);
+-        tidy.parse(new ByteArrayInputStream(commentCleaned.getBytes(StandardCharsets.UTF_8)), out);
+-        commentCleaned = new String(out.toByteArray(), StandardCharsets.UTF_8);
+-
+-        if (commentCleaned == null || commentCleaned.isEmpty()) {
+-            return "";
+-        }
+-
+-        // strip the header/body stuff
+-        String ls = System.getProperty("line.separator");
+-        int startPos = commentCleaned.indexOf("<body>" + ls) + 6 + ls.length();
+-        int endPos = commentCleaned.indexOf(ls + "</body>");
+-        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:
+      * <ul>
+@@ -301,7 +254,7 @@ public final class GeneratorUtils {
+         HTMLEditorKit.ParserCallback htmlCallback = new MojoParserCallback(sb);
+ 
+         try {
+-            parser.parse(new StringReader(makeHtmlValid(html)), htmlCallback, true);
++            parser.parse(new StringReader(html), htmlCallback, true);
+         } catch (IOException e) {
+             throw new RuntimeException(e);
+         }
+diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGenerator.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGenerator.java
+index cf5c5c48..9f435f0e 100644
+--- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGenerator.java
++++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGenerator.java
+@@ -201,12 +201,7 @@ public class PluginDescriptorFilesGenerator implements Generator {
+      */
+     private static String getTextValue(DescriptorType type, boolean containsXhtmlValue, String text) {
+         final String xhtmlText;
+-        if (!containsXhtmlValue) // text comes from legacy extractor
+-        {
+-            xhtmlText = GeneratorUtils.makeHtmlValid(text);
+-        } else {
+             xhtmlText = text;
+-        }
+         if (type != DescriptorType.XHTML) {
+             return new HtmlToPlainTextConverter().convert(text);
+         } else {
+-- 
+2.41.0
+

0003-Port-to-plexus-utils-3.0.24.patch

@@ -1,33 +0,0 @@
-From 690138ca262b03d7e43336dd9bfee2ca0e1b03f9 Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk@redhat.com>
-Date: Thu, 12 May 2016 09:36:10 +0200
-Subject: [PATCH 3/3] Port to plexus-utils 3.0.24
-
----
- .../maven/tools/plugin/generator/PluginHelpGenerator.java      | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
-index 23c3ed9..7543496 100644
---- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
-+++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
-@@ -302,7 +302,15 @@ public class PluginHelpGenerator
-             return;
-         }
- 
--        Properties properties = PropertyUtils.loadProperties( tmpPropertiesFile );
-+        Properties properties;
-+        try
-+        {
-+            properties = PropertyUtils.loadProperties( tmpPropertiesFile );
-+        }
-+        catch ( IOException exc )
-+        {
-+            properties = new Properties();
-+        }
- 
-         String helpPackageName = properties.getProperty( "helpPackageName" );
- 
--- 
-2.14.3
-

0004-Remove-dependency-on-jtidy.patch

@@ -1,145 +0,0 @@
---- 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 =
-                         "<strong>" + getBundle( locale ).getString( "report.plugin.goal.deprecated" ) + "</strong> "
--                            + 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 @@
- 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;
- 
- /**
-  * 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 <code>null</code>.
--     * @return The description with valid XHTML tags, never <code>null</code>.
--     */
--    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( "<body>" + ls ) + 6 + ls.length();
--        int endPos = commentCleaned.indexOf( ls + "</body>" );
--        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:
-      * <ul>
-@@ -337,7 +284,7 @@
- 
-         try
-         {
--            parser.parse( new StringReader( makeHtmlValid( html ) ), htmlCallback, true );
-+            parser.parse( new StringReader( html ), htmlCallback, true );
-         }
-         catch ( IOException e )
-         {
---- 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
-             {

maven-plugin-plugin-bootstrap.spec

@@ -19,7 +19,7 @@
 %global base_name maven-plugin-tools
 %global artifactId maven-plugin-plugin
 Name:           %{artifactId}-bootstrap
-Version:        3.6.0
+Version:        3.9.0
 Release:        0
 Summary:        Maven Plugin Plugin
 License:        Apache-2.0
@@ -27,16 +27,18 @@ Group:          Development/Libraries/Java
 URL:            https://maven.apache.org/plugin-tools/
 Source0:        https://repo1.maven.org/maven2/org/apache/maven/plugin-tools/%{base_name}/%{version}/%{base_name}-%{version}-source-release.zip
 Source1:        %{base_name}-build.tar.xz
-Patch0:         0001-Avoid-duplicate-MOJO-parameters.patch
+Patch0:         0002-Remove-dependency-on-jtidy.patch
-Patch1:         0002-Deal-with-nulls-from-getComment.patch
-Patch2:         0003-Port-to-plexus-utils-3.0.24.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.
 Patch20:        maven-plugin-plugin-bootstrap-resouces.patch
 BuildRequires:  ant
+BuildRequires:  apache-commons-cli
+BuildRequires:  atinject
+BuildRequires:  google-guice
+BuildRequires:  guava
 BuildRequires:  javapackages-local
+BuildRequires:  jdom2
 BuildRequires:  maven-doxia-logging-api
 BuildRequires:  maven-doxia-sink-api
 BuildRequires:  maven-doxia-sitetools
@@ -47,10 +49,18 @@ BuildRequires:  maven-plugin-tools-api
 BuildRequires:  maven-plugin-tools-generators
 BuildRequires:  maven-reporting-api
 BuildRequires:  maven-reporting-impl
-BuildRequires:  modello >= 2.0.0
+BuildRequires:  maven-resolver-api
-BuildRequires:  plexus-containers-container-default
+BuildRequires:  objectweb-asm
+BuildRequires:  plexus-build-api
+BuildRequires:  plexus-classworlds
+BuildRequires:  plexus-cli
+BuildRequires:  plexus-containers-component-annotations
+BuildRequires:  plexus-metadata-generator
 BuildRequires:  plexus-utils
 BuildRequires:  plexus-velocity
+BuildRequires:  qdox
+BuildRequires:  sisu-inject
+BuildRequires:  sisu-plexus
 BuildRequires:  unzip
 BuildRequires:  velocity
 BuildRequires:  xmvn-install
@@ -69,10 +79,7 @@ artifact metadata and a generic help goal.
 %prep
 %setup -q -n %{base_name}-%{version} -a1
 %patch0 -p1
-%patch1 -p1
+%patch20
-%patch2 -p1
-%patch3 -p1
-%patch20 -p1
 
 %pom_remove_plugin -r :maven-enforcer-plugin
 
@@ -80,14 +87,9 @@ artifact metadata and a generic help goal.
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>"
 
-# Why on the earth is this dependency there ???
-%pom_remove_dep :maven-surefire-common maven-plugin-plugin
-
 # Remove test dependencies because tests are skipped anyways.
 %pom_xpath_remove "pom:dependency[pom:scope='test']"
 
-%pom_change_dep org.easymock:easymock:: :::test maven-plugin-tools-annotations
-
 # For some reason, this dependency is not generated by javapackages-local
 # and for some reasons if we give it a scope 'runtime' it works
 %pom_remove_dep :maven-plugin-annotations maven-plugin-plugin
@@ -98,6 +100,11 @@ artifact metadata and a generic help goal.
 %build
 mkdir -p lib
 build-jar-repository -s lib \
+    atinject \
+	commons-cli \
+	guava/guava \
+    guice/google-guice \
+	jdom2/jdom2 \
 	maven-doxia/doxia-logging-api \
 	maven-doxia/doxia-sink-api \
 	maven-doxia-sitetools/doxia-site-renderer \
@@ -108,19 +115,29 @@ build-jar-repository -s lib \
 	maven/maven-plugin-api \
 	maven/maven-plugin-registry \
 	maven/maven-repository-metadata \
+	maven/maven-settings \
 	maven-plugin-tools/maven-plugin-annotations \
 	maven-plugin-tools/maven-plugin-tools-api \
 	maven-plugin-tools/maven-plugin-tools-generators \
 	maven-reporting-api/maven-reporting-api \
 	maven-reporting-impl/maven-reporting-impl \
-	plexus-containers/plexus-container-default \
+    maven-resolver/maven-resolver-api \
+	objectweb-asm/asm \
+	org.eclipse.sisu.inject \
+	org.eclipse.sisu.plexus \
+	plexus-classworlds \
+	plexus/cli \
+	plexus-containers/plexus-component-annotations \
+	plexus-metadata-generator \
+    plexus/plexus-build-api \
 	plexus/utils \
 	plexus-velocity/plexus-velocity \
+	qdox \
 	velocity
 
 %{mvn_file} :%{artifactId} %{base_name}/%{artifactId}
 pushd %{artifactId}
-%{ant} \
+%{ant} -v \
 	-Dtest.skip=true \
 	jar
 popd

maven-plugin-plugin.spec

@@ -18,17 +18,14 @@
 
 %global base_name maven-plugin-tools
 Name:           maven-plugin-plugin
-Version:        3.6.0
+Version:        3.9.0
 Release:        0
 Summary:        Maven Plugin Plugin
 License:        Apache-2.0
 Group:          Development/Libraries/Java
 URL:            https://maven.apache.org/plugin-tools/
 Source0:        https://repo1.maven.org/maven2/org/apache/maven/plugin-tools/%{base_name}/%{version}/%{base_name}-%{version}-source-release.zip
-Patch0:         0001-Avoid-duplicate-MOJO-parameters.patch
+Patch0:         0002-Remove-dependency-on-jtidy.patch
-Patch1:         0002-Deal-with-nulls-from-getComment.patch
-Patch2:         0003-Port-to-plexus-utils-3.0.24.patch
-Patch3:         0004-Remove-dependency-on-jtidy.patch
 BuildRequires:  fdupes
 BuildRequires:  maven-local
 BuildRequires:  unzip
@@ -36,15 +33,15 @@ BuildRequires:  mvn(org.apache.maven.doxia:doxia-sink-api)
 BuildRequires:  mvn(org.apache.maven.doxia:doxia-site-renderer)
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-tools-annotations)
+BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-tools-ant)
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-tools-api)
+BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-tools-beanshell)
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-tools-generators)
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-tools-java)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
 BuildRequires:  mvn(org.apache.maven.reporting:maven-reporting-api)
 BuildRequires:  mvn(org.apache.maven.reporting:maven-reporting-impl)
 BuildRequires:  mvn(org.apache.maven.surefire:maven-surefire-common)
-BuildRequires:  mvn(org.apache.maven:maven-artifact:2.2.1)
-BuildRequires:  mvn(org.apache.maven:maven-model:2.2.1)
 BuildRequires:  mvn(org.apache.maven:maven-parent:pom:)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
 BuildRequires:  mvn(org.apache.maven:maven-repository-metadata)
@@ -77,9 +74,6 @@ API documentation for %{name}.
 %prep
 %setup -q -n %{base_name}-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %pom_remove_plugin -r :maven-enforcer-plugin
 
@@ -90,18 +84,16 @@ API documentation for %{name}.
 # Remove test dependencies because tests are skipped anyways.
 %pom_xpath_remove "pom:dependency[pom:scope='test']"
 
-# Why on the earth is this dependency there ???
+%pom_remove_dep org.junit:junit-bom
-%pom_remove_dep :maven-surefire-common maven-plugin-plugin
-
-%pom_change_dep org.easymock:easymock:: :::test maven-plugin-tools-annotations
 
 %build
 pushd %{name}
 %{mvn_file} :%{name} %{base_name}/%{name}
-%{mvn_build} -f \
+%{mvn_build} -f -- \
 %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-	-- -Dmaven.compiler.release=7
+    -Dmaven.compiler.release=8 \
 %endif
+    -Dsource=8
 
 popd
 

maven-plugin-tools.spec

@@ -17,7 +17,7 @@
 
 
 Name:           maven-plugin-tools
-Version:        3.6.0
+Version:        3.9.0
 Release:        0
 Summary:        Maven Plugin Tools
 License:        Apache-2.0
@@ -25,10 +25,7 @@ Group:          Development/Libraries/Java
 URL:            https://maven.apache.org/plugin-tools/
 Source0:        https://repo1.maven.org/maven2/org/apache/maven/plugin-tools/%{name}/%{version}/%{name}-%{version}-source-release.zip
 Source1:        %{name}-build.tar.xz
-Patch0:         0001-Avoid-duplicate-MOJO-parameters.patch
+Patch0:         0002-Remove-dependency-on-jtidy.patch
-Patch1:         0002-Deal-with-nulls-from-getComment.patch
-Patch2:         0003-Port-to-plexus-utils-3.0.24.patch
-Patch3:         0004-Remove-dependency-on-jtidy.patch
 BuildRequires:  ant
 BuildRequires:  apache-commons-cli
 BuildRequires:  atinject
@@ -36,26 +33,33 @@ BuildRequires:  bsh2
 BuildRequires:  fdupes
 BuildRequires:  google-guice
 BuildRequires:  guava
+BuildRequires:  httpcomponents-client
+BuildRequires:  httpcomponents-core
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local >= 6
 BuildRequires:  jdom2
-BuildRequires:  junit
+BuildRequires:  jsoup
 BuildRequires:  maven-lib
 BuildRequires:  maven-reporting-api
+BuildRequires:  maven-resolver-api
+BuildRequires:  maven-wagon-provider-api
 BuildRequires:  modello >= 2.0.0
 BuildRequires:  objectweb-asm
+BuildRequires:  objectweb-asm
 BuildRequires:  plexus-ant-factory
 BuildRequires:  plexus-archiver
 BuildRequires:  plexus-bsh-factory
 BuildRequires:  plexus-classworlds
 BuildRequires:  plexus-cli
 BuildRequires:  plexus-containers-component-annotations
+BuildRequires:  plexus-languages
 BuildRequires:  plexus-metadata-generator
 BuildRequires:  plexus-utils
 BuildRequires:  plexus-velocity
 BuildRequires:  qdox
 BuildRequires:  sisu-inject
 BuildRequires:  sisu-plexus
+BuildRequires:  slf4j
 BuildRequires:  unzip
 BuildRequires:  velocity
 BuildRequires:  xbean
@@ -152,9 +156,6 @@ API documentation for %{name}.
 %prep
 %setup -q -a1
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %pom_remove_plugin -r :maven-enforcer-plugin
 
@@ -165,30 +166,33 @@ API documentation for %{name}.
 # Remove test dependencies because tests are skipped anyways.
 %pom_xpath_remove "pom:dependency[pom:scope='test']"
 
-%pom_change_dep org.easymock:easymock:: :::test maven-plugin-tools-annotations
-
 %pom_remove_dep net.sf.jtidy:jtidy maven-plugin-tools-generators
 
 %build
 mkdir -p lib
 build-jar-repository -s lib \
 	ant \
-	ant-launcher \
 	atinject \
 	bsh2/bsh \
 	commons-cli \
 	guava/guava \
 	guice/google-guice-no_aop \
+    httpcomponents/httpclient \
+    httpcomponents/httpcore \
 	jdom2/jdom2 \
-	junit \
+    jsoup/jsoup \
 	maven/maven-artifact \
 	maven/maven-compat \
 	maven/maven-core \
 	maven/maven-model \
 	maven/maven-plugin-api \
+	maven/maven-settings \
 	maven-reporting-api/maven-reporting-api \
+    maven-resolver/maven-resolver-api \
+    maven-wagon/provider-api \
 	objectweb-asm/asm \
 	objectweb-asm/asm-commons \
+    objectweb-asm/asm-util \
 	org.eclipse.sisu.inject \
 	org.eclipse.sisu.plexus \
 	plexus/ant-factory \
@@ -197,10 +201,12 @@ build-jar-repository -s lib \
 	plexus-classworlds \
 	plexus/cli \
 	plexus-containers/plexus-component-annotations \
+    plexus-languages/plexus-java \
 	plexus-metadata-generator \
 	plexus/utils \
 	plexus-velocity/plexus-velocity \
 	qdox \
+    slf4j/api \
 	velocity \
 	xbean/xbean-reflect