diff --git a/0001-Avoid-duplicate-MOJO-parameters.patch b/0001-Avoid-duplicate-MOJO-parameters.patch deleted file mode 100644 index c831661..0000000 --- a/0001-Avoid-duplicate-MOJO-parameters.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 0ebe12503766c6a76c507498e9e7f0cb1c4469c2 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -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 mojoAnnotatedClasses ) - { --- -2.14.3 - diff --git a/0002-Deal-with-nulls-from-getComment.patch b/0002-Deal-with-nulls-from-getComment.patch deleted file mode 100644 index dab247b..0000000 --- a/0002-Deal-with-nulls-from-getComment.patch +++ /dev/null @@ -1,66 +0,0 @@ -From ea64c5b59f5f820a73ab3e82b6898762e55a8719 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -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 - diff --git a/0002-Remove-dependency-on-jtidy.patch b/0002-Remove-dependency-on-jtidy.patch new file mode 100644 index 0000000..c43a771 --- /dev/null +++ b/0002-Remove-dependency-on-jtidy.patch @@ -0,0 +1,106 @@ +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 + +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 null. +- * @return The description with valid XHTML tags, never null. +- * @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("" + 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: + *
    +@@ -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 + diff --git a/0003-Port-to-plexus-utils-3.0.24.patch b/0003-Port-to-plexus-utils-3.0.24.patch deleted file mode 100644 index f672937..0000000 --- a/0003-Port-to-plexus-utils-3.0.24.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 690138ca262b03d7e43336dd9bfee2ca0e1b03f9 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -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 - diff --git a/0004-Remove-dependency-on-jtidy.patch b/0004-Remove-dependency-on-jtidy.patch deleted file mode 100644 index ff7be23..0000000 --- a/0004-Remove-dependency-on-jtidy.patch +++ /dev/null @@ -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 = - "" + 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 @@ - 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 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: - *
      -@@ -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 - { diff --git a/maven-plugin-plugin-bootstrap-resouces.patch b/maven-plugin-plugin-bootstrap-resouces.patch index 9e7b301..3f0d357 100644 --- a/maven-plugin-plugin-bootstrap-resouces.patch +++ b/maven-plugin-plugin-bootstrap-resouces.patch @@ -1,6 +1,6 @@ ---- maven-plugin-tools-3.6.0/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-tools-3.6.0/maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-plugin-plugin/plugin-help.xml 2019-11-25 11:03:12.945643770 +0100 -@@ -0,0 +1,385 @@ +--- 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 +@@ -0,0 +1,345 @@ + + + ${project.name} @@ -12,10 +12,10 @@ + + + addPluginArtifactMetadata -+ Inject any plugin-specific artifact metadata to the project's artifact, for subsequent installation and deployment. It is used: -+1. to add the latest metadata (which is plugin-specific) for shipping alongside the plugin's artifact -+2. to define plugin mapping in the group -+ ++ Inject any plugin-specific artifact metadata to the project's artifact, for subsequent installation and deployment. It is used: ++* to add the latest metadata (which is plugin-specific) for shipping alongside the plugin's artifact ++* to define plugin mapping in the group ++See also: org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata, org.apache.maven.artifact.repository.metadata.GroupRepositoryMetadata + false + true + false @@ -35,10 +35,7 @@ + java.lang.String + false + true -+ Inject any plugin-specific artifact metadata to the project's artifact, for subsequent installation and deployment. It is used: -+1. to add the latest metadata (which is plugin-specific) for shipping alongside the plugin's artifact -+2. to define plugin mapping in the group -+ ++ The prefix for the plugin goal. + + + skip @@ -46,10 +43,7 @@ + 2.8 + false + true -+ Inject any plugin-specific artifact metadata to the project's artifact, for subsequent installation and deployment. It is used: -+1. to add the latest metadata (which is plugin-specific) for shipping alongside the plugin's artifact -+2. to define plugin mapping in the group -+ ++ Set this to "true" to skip invoking any goals or reports of the plugin. + + + @@ -58,11 +52,12 @@ + + + descriptor -+ Generate a plugin descriptor. ++ ++Generate a plugin descriptor. + -+Note: Since 3.0, for Java plugin annotations support, default phase defined by this goal is after the 'compilation' of any scripts. This doesn't override the default binding coded at generate-resources phase in Maven core. ++Note: Since 3.0, for Java plugin annotations support, default phase <http://maven.apache.org/ref/current/maven-core/lifecycles.html> defined by this goal is after the "compilation" of any scripts. This doesn't override the default binding coded at generate-resources phase in Maven core. + -+ runtime ++ compile+runtime + false + true + false @@ -78,52 +73,120 @@ + true + + ++ checkExpectedProvidedScope ++ boolean ++ 3.6.3 ++ false ++ true ++ Flag controlling is "expected dependencies in provided scope" check to be performed or not. Default value: true. ++ ++ + encoding + java.lang.String + 2.5 + false + true -+ Abstract class for this Plugin. ++ The file encoding of the source files. ++ ++ ++ expectedProvidedScopeExclusions ++ java.util.List<java.lang.String> ++ 3.6.3 ++ false ++ true ++ List of groupId:artifactId strings of artifact coordinates that are to be excluded from "expected provided scope" check. Default value: ["org.apache.maven:maven-archiver", "org.apache.maven:maven-jxr", "org.apache.maven:plexus-utils"]. ++ ++ ++ expectedProvidedScopeGroupIds ++ java.util.List<java.lang.String> ++ 3.6.3 ++ false ++ true ++ List of groupId strings of artifact coordinates that are expected to be in "provided" scope. Default value: ["org.apache.maven"]. ++ ++ ++ externalJavadocBaseUrls ++ links ++ java.util.List<java.net.URI> ++ 3.7.0 ++ false ++ true ++ Creates links to existing external javadoc-generated documentation. ++Notes: all given links should have a fetchable /package-list or /element-list file. For instance: <externalJavadocBaseUrls> <externalJavadocBaseUrl>https://docs.oracle.com/javase/8/docs/api/</externalJavadocBaseUrl> <externalJavadocBaseUrls> is valid because https://docs.oracle.com/javase/8/docs/api/package-list exists. See link option of the javadoc tool <https://docs.oracle.com/en/java/javase/17/docs/specs/man/javadoc.html#standard-doclet-options>. Using this parameter requires connectivity to the given URLs during the goal execution. + + + extractors -+ java.util.Set ++ java.util.Set<java.lang.String> + false + true -+ Abstract class for this Plugin. ++ ++The role names of mojo extractors to use. ++ ++If not set, all mojo extractors will be used. If set to an empty extractor name, no mojo extractors will be used. ++Example: <!-- Use all mojo extractors --> <extractors/> <!-- Use no mojo extractors --> <extractors> <extractor/> </extractors> <!-- Use only bsh mojo extractor --> <extractors> <extractor>bsh</extractor> </extractors> The extractors with the following names ship with maven-plugin-tools: ++* java-annotations ++* java-javadoc, deprecated ++* ant, deprecated ++* bsh, deprecated + + + goalPrefix + java.lang.String + false + true -+ Abstract class for this Plugin. ++ The goal prefix that will appear before the ":". ++ ++ ++ internalJavadocBaseUrl ++ java.net.URI ++ 3.7.0 ++ false ++ true ++ The base URL for the Javadoc site containing the current project's API documentation. This may be relative to the root of the generated Maven site. It does not need to exist yet at the time when this goal is executed. Must end with a slash. In case this is set the javadoc reporting goal should be executed prior to Plugin Report. ++ ++ ++ internalJavadocVersion ++ java.lang.String ++ 3.7.0 ++ false ++ true ++ The version of the javadoc tool (equal to the container JDK version) used to generate the internal javadoc Only relevant if internalJavadocBaseUrl is set. The default value needs to be overwritten in case toolchains are being used for generating Javadoc. + + + mojoDependencies -+ java.util.List ++ java.util.List<java.lang.String> + 3.5 + false + true -+ Abstract class for this Plugin. -+ -+ -+ outputDirectory -+ java.io.File -+ false -+ true -+ Generate a plugin descriptor. -+ -+Note: Since 3.0, for Java plugin annotations support, default phase defined by this goal is after the 'compilation' of any scripts. This doesn't override the default binding coded at generate-resources phase in Maven core. -+ ++ Specify the dependencies as groupId:artifactId containing (abstract) Mojos, to filter dependencies scanned at runtime and focus on dependencies that are really useful to Mojo analysis. By default, the value is null and all dependencies are scanned (as before this parameter was added). If specified in the configuration with no children, no dependencies are scanned. + + + packagingTypes -+ java.util.List ++ java.util.List<java.lang.String> + 3.3 + false + true -+ Abstract class for this Plugin. ++ Maven plugin packaging types. Default is single "maven-plugin". ++ ++ ++ requiredJavaVersion ++ java.lang.String ++ 3.8.0 ++ false ++ true ++ The required Java version to set in the plugin descriptor. This is evaluated by Maven 4 and ignored by earlier Maven versions. Can be either one of the following formats: ++* A version range which specifies the supported Java versions. It can either use the usual mathematical syntax like "[2.0.10,2.1.0),[3.0,)" or use a single version like "2.2.1". The latter is a short form for "[2.2.1,)", i.e. denotes the minimum version required. ++* "auto" to determine the minimum Java version from the binary class version being generated during compilation (determined by the extractor). ++ ++ ++ requiredMavenVersion ++ java.lang.String ++ 3.8.0 ++ false ++ true ++ The required Maven version to set in the plugin descriptor. This is evaluated by Maven 4 and ignored by earlier Maven versions. Can be either one of the following formats: ++* A version range which specifies the supported Maven versions. It can either use the usual mathematical syntax like "[2.0.10,2.1.0),[3.0,)" or use a single version like "2.2.1". The latter is a short form for "[2.2.1,)", i.e. denotes the minimum version required. ++* "auto" to determine the minimum Maven version from the POM's Maven prerequisite, or if not set the referenced Maven Plugin API version. This value takes precedence over the POM's Maven prerequisite <https://maven.apache.org/pom.html#Prerequisites> in Maven 4. + + + skip @@ -131,7 +194,7 @@ + 2.8 + false + true -+ Abstract class for this Plugin. ++ Set this to "true" to skip invoking any goals or reports of the plugin. + + + skipDescriptor @@ -139,10 +202,7 @@ + 2.6 + false + true -+ Generate a plugin descriptor. -+ -+Note: Since 3.0, for Java plugin annotations support, default phase defined by this goal is after the 'compilation' of any scripts. This doesn't override the default binding coded at generate-resources phase in Maven core. -+ ++ A flag to disable generation of the plugin.xml in favor of a hand authored plugin descriptor. + + + skipErrorNoDescriptorsFound @@ -150,12 +210,17 @@ + 3.0 + false + true -+ Abstract class for this Plugin. ++ By default, an exception is throw if no mojo descriptor is found. As the maven-plugin is defined in core, the descriptor generator mojo is bound to generate-resources phase. But for annotations, the compiled classes are needed, so skip error + + + ++ ${maven.plugin.checkExpectedProvidedScope} + ${encoding} -+ ++ ${externalJavadocBaseUrls} ++ ${internalJavadocBaseUrl} ++ ${internalJavadocVersion} ++ ++ + ${maven.plugin.skip} + + ${maven.plugin.skipErrorNoDescriptorsFound} @@ -171,7 +236,7 @@ + false + false + true -+ org.apache.maven.plugin.plugin.HelpMojo ++ org.apache.maven.plugins.maven_plugin_plugin.HelpMojo + java + per-lookup + once-per-session @@ -182,32 +247,28 @@ + boolean + false + true -+ Display help information on maven-plugin-plugin. -+Call mvn plugin:help -Ddetail=true -Dgoal=<goal-name> to display parameter details. ++ If true, display all settable properties for each goal. + + + goal + java.lang.String + false + true -+ Display help information on maven-plugin-plugin. -+Call mvn plugin:help -Ddetail=true -Dgoal=<goal-name> to display parameter details. ++ The name of the goal for which to show help. If unspecified, all goals will be displayed. + + + indentSize + int + false + true -+ Display help information on maven-plugin-plugin. -+Call mvn plugin:help -Ddetail=true -Dgoal=<goal-name> to display parameter details. ++ The number of spaces per indentation level, should be positive. + + + lineLength + int + false + true -+ Display help information on maven-plugin-plugin. -+Call mvn plugin:help -Ddetail=true -Dgoal=<goal-name> to display parameter details. ++ The maximum length of a display line, should be positive. + + + @@ -219,7 +280,7 @@ + + + helpmojo -+ Generates a HelpMojo class. ++ Generates a HelpMojo class. Relies at runtime on one output file from DescriptorGeneratorMojo. + compile + false + true @@ -236,26 +297,11 @@ + true + + -+ encoding -+ java.lang.String -+ 2.5 -+ false -+ true -+ Abstract class for this Plugin. -+ -+ -+ extractors -+ java.util.Set -+ false -+ true -+ Abstract class for this Plugin. -+ -+ + goalPrefix + java.lang.String + false + true -+ Abstract class for this Plugin. ++ The goal prefix that will appear before the ":". + + + helpPackageName @@ -263,30 +309,26 @@ + 2.6 + false + true -+ Generates a HelpMojo class. -+ -+ -+ mojoDependencies -+ java.util.List -+ 3.5 -+ false -+ true -+ Abstract class for this Plugin. ++ The name of the package for the generated HelpMojo. ++By default, the package name will be calculated as groupId + "." + artifactId with additional ++ ++* - (dashes) will be replaced by _ (underscores) ++* _ (underscore) will be added before each number or Java keyword at the beginning of name + + + outputDirectory + java.io.File + false + true -+ Generates a HelpMojo class. ++ The directory where the generated HelpMojo file will be put. + + + packagingTypes -+ java.util.List ++ java.util.List<java.lang.String> + 3.3 + false + true -+ Abstract class for this Plugin. ++ Maven plugin packaging types. Default is single "maven-plugin". + + + skip @@ -294,101 +336,19 @@ + 2.8 + false + true -+ Abstract class for this Plugin. -+ -+ -+ skipErrorNoDescriptorsFound -+ boolean -+ 3.0 -+ false -+ true -+ Abstract class for this Plugin. ++ Set this to "true" to skip invoking any goals or reports of the plugin. + + + -+ ${encoding} + + ${maven.plugin.skip} -+ ${maven.plugin.skipErrorNoDescriptorsFound} -+ -+ -+ -+ report -+ Generates the Plugin's documentation report: plugin-info.html plugin overview page, and one goal-mojo.html per goal. -+ false -+ true -+ false -+ false -+ false -+ true -+ process-classes -+ org.apache.maven.plugin.plugin.PluginReport -+ java -+ per-lookup -+ once-per-session -+ 2.0 -+ true -+ -+ -+ encoding -+ java.lang.String -+ 2.7 -+ false -+ true -+ Generates the Plugin's documentation report: plugin-info.html plugin overview page, and one goal-mojo.html per goal. -+ -+ -+ goalPrefix -+ java.lang.String -+ 2.4 -+ false -+ true -+ Generates the Plugin's documentation report: plugin-info.html plugin overview page, and one goal-mojo.html per goal. -+ -+ -+ outputDirectory -+ java.io.File -+ false -+ true -+ Generates the Plugin's documentation report: plugin-info.html plugin overview page, and one goal-mojo.html per goal. -+ -+ -+ requirements -+ org.apache.maven.plugin.plugin.Requirements -+ false -+ true -+ Generates the Plugin's documentation report: plugin-info.html plugin overview page, and one goal-mojo.html per goal. -+ -+ -+ skip -+ boolean -+ 2.8 -+ false -+ true -+ Generates the Plugin's documentation report: plugin-info.html plugin overview page, and one goal-mojo.html per goal. -+ -+ -+ skipReport -+ boolean -+ 2.8 -+ false -+ true -+ Generates the Plugin's documentation report: plugin-info.html plugin overview page, and one goal-mojo.html per goal. -+ -+ -+ -+ ${encoding} -+ ${goalPrefix} -+ -+ ${maven.plugin.skip} -+ ${maven.plugin.report.skip} + + + + ---- 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,1056 @@ +--- 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 @@ + + + ${project.name} @@ -402,15 +362,10 @@ + + + addPluginArtifactMetadata -+ Inject any plugin-specific -+<a href="/ref/current/maven-repository-metadata/repository-metadata.html">artifact metadata</a> to the project's -+artifact, for subsequent installation and deployment. -+It is used: -+<ol> -+<li>to add the <code>latest</code> metadata (which is plugin-specific) for shipping alongside the plugin's -+ artifact</li> -+<li>to define plugin mapping in the group</li> -+</ol> ++ Inject any plugin-specific artifact metadata to the project's artifact, for subsequent installation and deployment. It is used: ++* to add the latest metadata (which is plugin-specific) for shipping alongside the plugin's artifact ++* to define plugin mapping in the group ++See also: org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata, org.apache.maven.artifact.repository.metadata.GroupRepositoryMetadata + false + true + false @@ -430,30 +385,14 @@ + java.lang.String + false + true -+ Inject any plugin-specific -+<a href="/ref/current/maven-repository-metadata/repository-metadata.html">artifact metadata</a> to the project's -+artifact, for subsequent installation and deployment. -+It is used: -+<ol> -+<li>to add the <code>latest</code> metadata (which is plugin-specific) for shipping alongside the plugin's -+ artifact</li> -+<li>to define plugin mapping in the group</li> -+</ol> ++ The prefix for the plugin goal. + + + project + org.apache.maven.project.MavenProject + false + false -+ Inject any plugin-specific -+<a href="/ref/current/maven-repository-metadata/repository-metadata.html">artifact metadata</a> to the project's -+artifact, for subsequent installation and deployment. -+It is used: -+<ol> -+<li>to add the <code>latest</code> metadata (which is plugin-specific) for shipping alongside the plugin's -+ artifact</li> -+<li>to define plugin mapping in the group</li> -+</ol> ++ The project artifact, which should have the latest metadata added to it. + + + skip @@ -461,15 +400,7 @@ + 2.8 + false + true -+ Inject any plugin-specific -+<a href="/ref/current/maven-repository-metadata/repository-metadata.html">artifact metadata</a> to the project's -+artifact, for subsequent installation and deployment. -+It is used: -+<ol> -+<li>to add the <code>latest</code> metadata (which is plugin-specific) for shipping alongside the plugin's -+ artifact</li> -+<li>to define plugin mapping in the group</li> -+</ol> ++ Set this to "true" to skip invoking any goals or reports of the plugin. + + + @@ -479,17 +410,12 @@ + + + descriptor -+ <p> ++ +Generate a plugin descriptor. -+</p> -+<p> -+<b>Note:</b> Since 3.0, for Java plugin annotations support, -+default <a href="http://maven.apache.org/ref/current/maven-core/lifecycles.html">phase</a> -+defined by this goal is after the "compilation" of any scripts. This doesn't override -+<a href="/ref/current/maven-core/default-bindings.html#Bindings_for_maven-plugin_packaging">the default binding coded -+at generate-resources phase</a> in Maven core. -+</p> -+ runtime ++ ++Note: Since 3.0, for Java plugin annotations support, default phase <http://maven.apache.org/ref/current/maven-core/lifecycles.html> defined by this goal is after the "compilation" of any scripts. This doesn't override the default binding coded at generate-resources phase in Maven core. ++ ++ compile+runtime + false + true + false @@ -505,12 +431,12 @@ + true + + -+ dependencies -+ java.util.Set -+ 3.0 -+ true -+ false -+ Abstract class for this Plugin. ++ checkExpectedProvidedScope ++ boolean ++ 3.6.3 ++ false ++ true ++ Flag controlling is "expected dependencies in provided scope" check to be performed or not. Default value: true. + + + encoding @@ -518,29 +444,71 @@ + 2.5 + false + true -+ Abstract class for this Plugin. ++ The file encoding of the source files. ++ ++ ++ expectedProvidedScopeExclusions ++ java.util.List ++ 3.6.3 ++ false ++ true ++ List of groupId:artifactId strings of artifact coordinates that are to be excluded from "expected provided scope" check. Default value: ["org.apache.maven:maven-archiver", "org.apache.maven:maven-jxr", "org.apache.maven:plexus-utils"]. ++ ++ ++ expectedProvidedScopeGroupIds ++ java.util.List ++ 3.6.3 ++ false ++ true ++ List of groupId strings of artifact coordinates that are expected to be in "provided" scope. Default value: ["org.apache.maven"]. ++ ++ ++ externalJavadocBaseUrls ++ links ++ java.util.List ++ 3.7.0 ++ false ++ true ++ Creates links to existing external javadoc-generated documentation. ++Notes: all given links should have a fetchable /package-list or /element-list file. For instance: <externalJavadocBaseUrls> <externalJavadocBaseUrl>https://docs.oracle.com/javase/8/docs/api/</externalJavadocBaseUrl> <externalJavadocBaseUrls> is valid because https://docs.oracle.com/javase/8/docs/api/package-list exists. See link option of the javadoc tool <https://docs.oracle.com/en/java/javase/17/docs/specs/man/javadoc.html#standard-doclet-options>. Using this parameter requires connectivity to the given URLs during the goal execution. + + + extractors + java.util.Set + false + true -+ Abstract class for this Plugin. ++ ++The role names of mojo extractors to use. ++ ++If not set, all mojo extractors will be used. If set to an empty extractor name, no mojo extractors will be used. ++Example: <!-- Use all mojo extractors --> <extractors/> <!-- Use no mojo extractors --> <extractors> <extractor/> </extractors> <!-- Use only bsh mojo extractor --> <extractors> <extractor>bsh</extractor> </extractors> The extractors with the following names ship with maven-plugin-tools: ++* java-annotations ++* java-javadoc, deprecated ++* ant, deprecated ++* bsh, deprecated + + + goalPrefix + java.lang.String + false + true -+ Abstract class for this Plugin. ++ The goal prefix that will appear before the ":". + + -+ local -+ org.apache.maven.artifact.repository.ArtifactRepository -+ 3.0 -+ true -+ false -+ Abstract class for this Plugin. ++ internalJavadocBaseUrl ++ java.net.URI ++ 3.7.0 ++ false ++ true ++ The base URL for the Javadoc site containing the current project's API documentation. This may be relative to the root of the generated Maven site. It does not need to exist yet at the time when this goal is executed. Must end with a slash. In case this is set the javadoc reporting goal should be executed prior to Plugin Report. ++ ++ ++ internalJavadocVersion ++ java.lang.String ++ 3.7.0 ++ false ++ true ++ The version of the javadoc tool (equal to the container JDK version) used to generate the internal javadoc Only relevant if internalJavadocBaseUrl is set. The default value needs to be overwritten in case toolchains are being used for generating Javadoc. + + + mojoDependencies @@ -548,23 +516,14 @@ + 3.5 + false + true -+ Abstract class for this Plugin. ++ Specify the dependencies as groupId:artifactId containing (abstract) Mojos, to filter dependencies scanned at runtime and focus on dependencies that are really useful to Mojo analysis. By default, the value is null and all dependencies are scanned (as before this parameter was added). If specified in the configuration with no children, no dependencies are scanned. + + + outputDirectory + java.io.File + false -+ true -+ <p> -+Generate a plugin descriptor. -+</p> -+<p> -+<b>Note:</b> Since 3.0, for Java plugin annotations support, -+default <a href="http://maven.apache.org/ref/current/maven-core/lifecycles.html">phase</a> -+defined by this goal is after the "compilation" of any scripts. This doesn't override -+<a href="/ref/current/maven-core/default-bindings.html#Bindings_for_maven-plugin_packaging">the default binding coded -+at generate-resources phase</a> in Maven core. -+</p> ++ false ++ The directory where the generated plugin.xml file will be put. + + + packagingTypes @@ -572,22 +531,49 @@ + 3.3 + false + true -+ Abstract class for this Plugin. ++ Maven plugin packaging types. Default is single "maven-plugin". + + + project + org.apache.maven.project.MavenProject + false + false -+ Abstract class for this Plugin. ++ The project currently being built. + + -+ remoteRepos -+ java.util.List -+ 3.0 ++ repoSession ++ org.eclipse.aether.RepositorySystemSession + true + false -+ Abstract class for this Plugin. ++ ++ ++ ++ requiredJavaVersion ++ java.lang.String ++ 3.8.0 ++ false ++ true ++ The required Java version to set in the plugin descriptor. This is evaluated by Maven 4 and ignored by earlier Maven versions. Can be either one of the following formats: ++* A version range which specifies the supported Java versions. It can either use the usual mathematical syntax like "[2.0.10,2.1.0),[3.0,)" or use a single version like "2.2.1". The latter is a short form for "[2.2.1,)", i.e. denotes the minimum version required. ++* "auto" to determine the minimum Java version from the binary class version being generated during compilation (determined by the extractor). ++ ++ ++ requiredMavenVersion ++ java.lang.String ++ 3.8.0 ++ false ++ true ++ The required Maven version to set in the plugin descriptor. This is evaluated by Maven 4 and ignored by earlier Maven versions. Can be either one of the following formats: ++* A version range which specifies the supported Maven versions. It can either use the usual mathematical syntax like "[2.0.10,2.1.0),[3.0,)" or use a single version like "2.2.1". The latter is a short form for "[2.2.1,)", i.e. denotes the minimum version required. ++* "auto" to determine the minimum Maven version from the POM's Maven prerequisite, or if not set the referenced Maven Plugin API version. This value takes precedence over the POM's Maven prerequisite <https://maven.apache.org/pom.html#Prerequisites> in Maven 4. ++ ++ ++ settings ++ org.apache.maven.settings.Settings ++ 3.7.0 ++ true ++ false ++ The Maven Settings, for evaluating proxy settings used to access #javadocLinks + + + skip @@ -595,7 +581,7 @@ + 2.8 + false + true -+ Abstract class for this Plugin. ++ Set this to "true" to skip invoking any goals or reports of the plugin. + + + skipDescriptor @@ -603,16 +589,7 @@ + 2.6 + false + true -+ <p> -+Generate a plugin descriptor. -+</p> -+<p> -+<b>Note:</b> Since 3.0, for Java plugin annotations support, -+default <a href="http://maven.apache.org/ref/current/maven-core/lifecycles.html">phase</a> -+defined by this goal is after the "compilation" of any scripts. This doesn't override -+<a href="/ref/current/maven-core/default-bindings.html#Bindings_for_maven-plugin_packaging">the default binding coded -+at generate-resources phase</a> in Maven core. -+</p> ++ A flag to disable generation of the plugin.xml in favor of a hand authored plugin descriptor. + + + skipErrorNoDescriptorsFound @@ -620,22 +597,31 @@ + 3.0 + false + true -+ Abstract class for this Plugin. ++ By default, an exception is throw if no mojo descriptor is found. As the maven-plugin is defined in core, the descriptor generator mojo is bound to generate-resources phase. But for annotations, the compiled classes are needed, so skip error + + + -+ ++ ${maven.plugin.checkExpectedProvidedScope} + ${encoding} -+ ++ ${externalJavadocBaseUrls} ++ ${internalJavadocBaseUrl} ++ ${internalJavadocVersion} + + -+ ++ ++ ++ ++ + ${maven.plugin.skip} + + ${maven.plugin.skipErrorNoDescriptorsFound} + + + ++ org.sonatype.plexus.build.incremental.BuildContext ++ buildContext ++ ++ + org.apache.maven.tools.plugin.scanner.MojoScanner + mojoScanner + @@ -643,15 +629,15 @@ + + + help -+ Display help information on maven-plugin-plugin.<br> -+Call <code>mvn plugin:help -Ddetail=true -Dgoal=&lt;goal-name&gt;</code> to display parameter details. ++ Display help information on maven-plugin-plugin. ++Call mvn plugin:help -Ddetail=true -Dgoal=<goal-name> to display parameter details. + false + false + false + false + false + true -+ org.apache.maven.plugin.plugin.HelpMojo ++ org.apache.maven.plugins.maven_plugin_plugin.HelpMojo + java + per-lookup + once-per-session @@ -662,32 +648,28 @@ + boolean + false + true -+ Display help information on maven-plugin-plugin.<br> -+Call <code>mvn plugin:help -Ddetail=true -Dgoal=&lt;goal-name&gt;</code> to display parameter details. ++ If true, display all settable properties for each goal. + + + goal + java.lang.String + false + true -+ Display help information on maven-plugin-plugin.<br> -+Call <code>mvn plugin:help -Ddetail=true -Dgoal=&lt;goal-name&gt;</code> to display parameter details. ++ The name of the goal for which to show help. If unspecified, all goals will be displayed. + + + indentSize + int + false + true -+ Display help information on maven-plugin-plugin.<br> -+Call <code>mvn plugin:help -Ddetail=true -Dgoal=&lt;goal-name&gt;</code> to display parameter details. ++ The number of spaces per indentation level, should be positive. + + + lineLength + int + false + true -+ Display help information on maven-plugin-plugin.<br> -+Call <code>mvn plugin:help -Ddetail=true -Dgoal=&lt;goal-name&gt;</code> to display parameter details. ++ The maximum length of a display line, should be positive. + + + @@ -699,7 +681,7 @@ + + + helpmojo -+ Generates a <code>HelpMojo</code> class. ++ Generates a HelpMojo class. Relies at runtime on one output file from DescriptorGeneratorMojo. + compile + false + true @@ -716,34 +698,11 @@ + true + + -+ dependencies -+ java.util.Set -+ 3.0 -+ true -+ false -+ Abstract class for this Plugin. -+ -+ -+ encoding -+ java.lang.String -+ 2.5 -+ false -+ true -+ Abstract class for this Plugin. -+ -+ -+ extractors -+ java.util.Set -+ false -+ true -+ Abstract class for this Plugin. -+ -+ + goalPrefix + java.lang.String + false + true -+ Abstract class for this Plugin. ++ The goal prefix that will appear before the ":". + + + helpPackageName @@ -751,30 +710,18 @@ + 2.6 + false + true -+ Generates a <code>HelpMojo</code> class. -+ -+ -+ local -+ org.apache.maven.artifact.repository.ArtifactRepository -+ 3.0 -+ true -+ false -+ Abstract class for this Plugin. -+ -+ -+ mojoDependencies -+ java.util.List -+ 3.5 -+ false -+ true -+ Abstract class for this Plugin. ++ The name of the package for the generated HelpMojo. ++By default, the package name will be calculated as groupId + "." + artifactId with additional ++ ++* - (dashes) will be replaced by _ (underscores) ++* _ (underscore) will be added before each number or Java keyword at the beginning of name + + + outputDirectory + java.io.File + false + true -+ Generates a <code>HelpMojo</code> class. ++ The directory where the generated HelpMojo file will be put. + + + packagingTypes @@ -782,22 +729,14 @@ + 3.3 + false + true -+ Abstract class for this Plugin. ++ Maven plugin packaging types. Default is single "maven-plugin". + + + project + org.apache.maven.project.MavenProject + false + false -+ Abstract class for this Plugin. -+ -+ -+ remoteRepos -+ java.util.List -+ 3.0 -+ true -+ false -+ Abstract class for this Plugin. ++ The project currently being built. + + + skip @@ -805,223 +744,28 @@ + 2.8 + false + true -+ Abstract class for this Plugin. -+ -+ -+ skipErrorNoDescriptorsFound -+ boolean -+ 3.0 -+ false -+ true -+ Abstract class for this Plugin. ++ Set this to "true" to skip invoking any goals or reports of the plugin. + + + -+ -+ ${encoding} -+ + + -+ + ${maven.plugin.skip} -+ ${maven.plugin.skipErrorNoDescriptorsFound} + + + -+ org.apache.maven.tools.plugin.scanner.MojoScanner -+ mojoScanner -+ -+ + org.codehaus.plexus.velocity.VelocityComponent + velocity + + + -+ -+ report -+ Generates the Plugin's documentation report: <code>plugin-info.html</code> plugin overview page, -+and one <code><i>goal</i>-mojo.html</code> per goal. -+ false -+ true -+ false -+ false -+ false -+ true -+ process-classes -+ org.apache.maven.plugin.plugin.PluginReport -+ java -+ per-lookup -+ once-per-session -+ 2.0 -+ true -+ -+ -+ dependencies -+ java.util.Set -+ 3.0 -+ true -+ false -+ Generates the Plugin's documentation report: <code>plugin-info.html</code> plugin overview page, -+and one <code><i>goal</i>-mojo.html</code> per goal. -+ -+ -+ encoding -+ java.lang.String -+ 2.7 -+ false -+ true -+ Generates the Plugin's documentation report: <code>plugin-info.html</code> plugin overview page, -+and one <code><i>goal</i>-mojo.html</code> per goal. -+ -+ -+ goalPrefix -+ java.lang.String -+ 2.4 -+ false -+ true -+ Generates the Plugin's documentation report: <code>plugin-info.html</code> plugin overview page, -+and one <code><i>goal</i>-mojo.html</code> per goal. -+ -+ -+ inputEncoding -+ java.lang.String -+ false -+ false -+ Generates the Plugin's documentation report: <code>plugin-info.html</code> plugin overview page, -+and one <code><i>goal</i>-mojo.html</code> per goal. -+ -+ -+ local -+ org.apache.maven.artifact.repository.ArtifactRepository -+ 3.0 -+ true -+ false -+ Generates the Plugin's documentation report: <code>plugin-info.html</code> plugin overview page, -+and one <code><i>goal</i>-mojo.html</code> per goal. -+ -+ -+ outputDirectory -+ java.io.File -+ false -+ true -+ Generates the Plugin's documentation report: <code>plugin-info.html</code> plugin overview page, -+and one <code><i>goal</i>-mojo.html</code> per goal. -+ -+ -+ outputEncoding -+ java.lang.String -+ false -+ false -+ Generates the Plugin's documentation report: <code>plugin-info.html</code> plugin overview page, -+and one <code><i>goal</i>-mojo.html</code> per goal. -+ -+ -+ pluginXmlFile -+ java.io.File -+ 3.5.1 -+ true -+ false -+ Generates the Plugin's documentation report: <code>plugin-info.html</code> plugin overview page, -+and one <code><i>goal</i>-mojo.html</code> per goal. -+ -+ -+ project -+ org.apache.maven.project.MavenProject -+ false -+ false -+ Generates the Plugin's documentation report: <code>plugin-info.html</code> plugin overview page, -+and one <code><i>goal</i>-mojo.html</code> per goal. -+ -+ -+ remoteRepos -+ java.util.List -+ 3.0 -+ true -+ false -+ Generates the Plugin's documentation report: <code>plugin-info.html</code> plugin overview page, -+and one <code><i>goal</i>-mojo.html</code> per goal. -+ -+ -+ requirements -+ org.apache.maven.plugin.plugin.Requirements -+ false -+ true -+ Generates the Plugin's documentation report: <code>plugin-info.html</code> plugin overview page, -+and one <code><i>goal</i>-mojo.html</code> per goal. -+ -+ -+ skip -+ boolean -+ 2.8 -+ false -+ true -+ Generates the Plugin's documentation report: <code>plugin-info.html</code> plugin overview page, -+and one <code><i>goal</i>-mojo.html</code> per goal. -+ -+ -+ skipReport -+ boolean -+ 2.8 -+ false -+ true -+ Generates the Plugin's documentation report: <code>plugin-info.html</code> plugin overview page, -+and one <code><i>goal</i>-mojo.html</code> per goal. -+ -+ -+ -+ -+ ${encoding} -+ ${goalPrefix} -+ ${encoding} -+ -+ -+ ${outputEncoding} -+ -+ -+ -+ ${maven.plugin.skip} -+ ${maven.plugin.report.skip} -+ -+ -+ -+ org.apache.maven.tools.plugin.scanner.MojoScanner -+ mojoScanner -+ -+ -+ org.apache.maven.execution.RuntimeInformation -+ rtInfo -+ -+ -+ org.apache.maven.doxia.siterenderer.Renderer -+ siteRenderer -+ -+ -+ + + + -+ org.apache.maven -+ maven-compat ++ org.slf4j ++ slf4j-api + jar -+ 3.0 -+ -+ -+ org.apache.maven -+ maven-settings -+ jar -+ 3.6.2 -+ -+ -+ org.apache.maven -+ maven-model-builder -+ jar -+ 3.6.2 -+ -+ -+ org.apache.maven -+ maven-builder-support -+ jar -+ 3.6.2 ++ 1.7.36 + + + javax.inject @@ -1030,268 +774,16 @@ + 1 + + -+ org.eclipse.sisu -+ org.eclipse.sisu.inject -+ jar -+ 0.3.3 -+ -+ -+ javax.enterprise -+ cdi-api -+ jar -+ 1.1 -+ -+ -+ javax.el -+ javax.el-api -+ jar -+ 3.0.0 -+ -+ -+ org.jboss.spec.javax.interceptor -+ jboss-interceptors-api_1.2_spec -+ jar -+ any -+ -+ -+ org.codehaus.plexus -+ plexus-interpolation -+ jar -+ 1.25 -+ -+ -+ org.apache.maven.wagon -+ wagon-provider-api -+ jar -+ 3.3.3 -+ -+ -+ org.apache.maven -+ maven-resolver-provider -+ jar -+ 3.6.2 -+ -+ -+ org.apache.maven.resolver -+ maven-resolver-spi -+ jar -+ 1.4.1 -+ -+ -+ org.slf4j -+ slf4j-api -+ jar -+ 1.7.25 -+ -+ -+ org.apache.maven -+ maven-core -+ jar -+ 3.0 -+ -+ -+ com.google.inject -+ guice -+ jar -+ 4.2.1 -+ -+ -+ aopalliance -+ aopalliance -+ jar -+ 1.0 -+ -+ -+ cglib -+ cglib -+ jar -+ 3.2.0 -+ -+ -+ org.apache.maven.resolver -+ maven-resolver-api -+ jar -+ 1.4.1 -+ -+ -+ org.apache.maven.resolver -+ maven-resolver-util -+ jar -+ 1.4.1 -+ -+ -+ org.apache.maven.resolver -+ maven-resolver-impl -+ jar -+ 1.4.1 -+ -+ -+ org.codehaus.plexus -+ plexus-component-annotations -+ jar -+ 1.5.5 -+ -+ -+ org.apache.maven -+ maven-settings-builder -+ jar -+ 3.6.2 -+ -+ -+ org.sonatype.plexus -+ plexus-sec-dispatcher -+ jar -+ 1.4 -+ -+ -+ org.sonatype.plexus -+ plexus-cipher -+ jar -+ 1.4 -+ -+ -+ org.eclipse.sisu -+ org.eclipse.sisu.plexus -+ jar -+ 0.3.3 -+ -+ + org.apache.maven.plugin-tools + maven-plugin-tools-api + jar -+ 3.6.0 -+ -+ -+ org.apache.maven.plugin-tools -+ maven-plugin-tools-generators -+ jar -+ 3.6.0 -+ -+ -+ xerces -+ dom3-xml-apis -+ jar -+ 1.0 -+ -+ -+ org.ow2.asm -+ asm-commons -+ jar -+ 7.0 -+ -+ -+ org.ow2.asm -+ asm-tree -+ jar -+ 7.2 -+ -+ -+ org.ow2.asm -+ asm-analysis -+ jar -+ 7.2 -+ -+ -+ org.ow2.asm -+ asm -+ jar -+ 7.0 -+ -+ -+ org.apache.maven.plugin-tools -+ maven-plugin-tools-java -+ jar -+ 3.6.0 -+ -+ -+ com.thoughtworks.qdox -+ qdox -+ jar -+ 2.0-M5 -+ -+ -+ org.apache.maven.plugin-tools -+ maven-plugin-tools-annotations -+ jar -+ 3.6.0 -+ -+ -+ org.codehaus.plexus -+ plexus-archiver -+ jar -+ 3.6.0 -+ -+ -+ org.codehaus.plexus -+ plexus-io -+ jar -+ 3.2.0 -+ -+ -+ org.apache.commons -+ commons-compress -+ jar -+ 1.19 -+ -+ -+ org.tukaani -+ xz -+ jar -+ 1.8 -+ -+ -+ org.apache.maven.plugin-tools -+ maven-plugin-annotations -+ jar -+ 3.6.0 -+ -+ -+ org.apache.maven.doxia -+ doxia-sink-api -+ jar -+ 1.4 -+ -+ -+ org.apache.maven.doxia -+ doxia-logging-api -+ jar -+ 1.7 -+ -+ -+ org.apache.maven.doxia -+ doxia-site-renderer -+ jar -+ 1.4 -+ -+ -+ org.apache.maven.doxia -+ doxia-decoration-model -+ jar -+ 1.7.5 -+ -+ -+ commons-collections -+ commons-collections -+ jar -+ 3.2.1 -+ -+ -+ org.apache.maven.doxia -+ doxia-core -+ jar -+ 1.7 -+ -+ -+ org.apache.httpcomponents -+ httpcore -+ jar -+ 4.0.1 ++ 3.9.0 + + + org.apache.httpcomponents + httpclient + jar -+ 4.0.2 ++ 4.5.14 + + + commons-logging @@ -1306,130 +798,46 @@ + any + + -+ xmlunit -+ xmlunit ++ org.apache.httpcomponents ++ httpcore + jar -+ 1.5 ++ 4.4.16 + + -+ org.apache.maven.doxia -+ doxia-module-xhtml ++ org.apache.maven.wagon ++ wagon-provider-api + jar -+ 1.7 ++ 2.4 + + + org.codehaus.plexus -+ plexus-i18n ++ plexus-java + jar -+ 1.0-beta-7 ++ 1.1.2 + + -+ org.apache.commons -+ commons-lang3 ++ org.apache.maven.plugin-tools ++ maven-plugin-tools-generators + jar -+ 3.5 -+ -+ -+ org.apache.maven.doxia -+ doxia-skin-model -+ jar -+ 1.7.5 -+ -+ -+ org.apache.maven -+ maven-plugin-api -+ jar -+ 3.0 -+ -+ -+ org.codehaus.plexus -+ plexus-classworlds -+ jar -+ 2.6.0 -+ -+ -+ org.apache.maven -+ maven-model -+ jar -+ 3.0 -+ -+ -+ org.apache.maven -+ maven-repository-metadata -+ jar -+ 3.0 -+ -+ -+ org.apache.maven -+ maven-artifact -+ jar -+ 3.0 -+ -+ -+ org.apache.maven.reporting -+ maven-reporting-impl -+ jar -+ 2.3 -+ -+ -+ org.apache.maven.shared -+ maven-shared-utils -+ jar -+ 3.2.0 -+ -+ -+ commons-io -+ commons-io -+ jar -+ 2.5 ++ 3.9.0 + + + org.apache.maven.reporting + maven-reporting-api + jar -+ 3.0 ++ 3.1.1 + + -+ org.codehaus.plexus -+ plexus-utils ++ org.apache.maven.doxia ++ doxia-sink-api + jar -+ 3.0.20 ++ 1.11.1 + + -+ org.codehaus.plexus -+ plexus-velocity ++ org.apache.maven.doxia ++ doxia-logging-api + jar -+ 1.1.8 -+ -+ -+ org.codehaus.plexus -+ plexus-container-default -+ jar -+ SYSTEM -+ -+ -+ org.apache.xbean -+ xbean-reflect -+ jar -+ SYSTEM -+ -+ -+ com.google.guava -+ guava -+ jar -+ 20.0 -+ -+ -+ junit -+ junit -+ jar -+ SYSTEM -+ -+ -+ org.hamcrest -+ hamcrest-core -+ jar -+ 1.3 ++ 1.9.1 + + + org.apache.velocity @@ -1443,13 +851,156 @@ + jar + 2.4 + ++ ++ org.ow2.asm ++ asm ++ jar ++ 9.5 ++ ++ ++ org.ow2.asm ++ asm-commons ++ jar ++ 9.5 ++ ++ ++ org.ow2.asm ++ asm-tree ++ jar ++ 9.5 ++ ++ ++ org.jsoup ++ jsoup ++ jar ++ 1.16.1 ++ ++ ++ net.sf.jtidy ++ jtidy ++ jar ++ r938 ++ ++ ++ org.apache.maven.plugin-tools ++ maven-plugin-tools-java ++ jar ++ 3.9.0 ++ ++ ++ com.thoughtworks.qdox ++ qdox ++ jar ++ 2.0.3 ++ ++ ++ org.apache.maven.plugin-tools ++ maven-plugin-tools-annotations ++ jar ++ 3.9.0 ++ ++ ++ org.codehaus.plexus ++ plexus-archiver ++ jar ++ 4.7.1 ++ ++ ++ org.codehaus.plexus ++ plexus-io ++ jar ++ 3.4.1 ++ ++ ++ commons-io ++ commons-io ++ jar ++ 2.13.0 ++ ++ ++ org.tukaani ++ xz ++ jar ++ 1.9 ++ ++ ++ org.apache.commons ++ commons-compress ++ jar ++ 1.23.0 ++ ++ ++ org.ow2.asm ++ asm-util ++ jar ++ 9.5 ++ ++ ++ org.ow2.asm ++ asm-analysis ++ jar ++ 9.5 ++ ++ ++ org.apache.maven.plugin-tools ++ maven-plugin-annotations ++ jar ++ 3.9.0 ++ ++ ++ org.apache.maven.plugin-tools ++ maven-plugin-tools-ant ++ jar ++ 3.9.0 ++ ++ ++ org.apache.maven.plugin-tools ++ maven-plugin-tools-model ++ jar ++ 3.9.0 ++ ++ ++ org.apache.maven.plugin-tools ++ maven-plugin-tools-beanshell ++ jar ++ 3.9.0 ++ ++ ++ org.apache-extras.beanshell ++ bsh ++ jar ++ 2.0b6 ++ ++ ++ org.codehaus.plexus ++ plexus-utils ++ jar ++ 3.5.1 ++ ++ ++ org.codehaus.plexus ++ plexus-velocity ++ jar ++ 1.2 ++ ++ ++ commons-collections ++ commons-collections ++ jar ++ 3.1 ++ ++ ++ org.sonatype.plexus ++ plexus-build-api ++ jar ++ 0.0.7 ++ + + ---- maven-plugin-tools-3.6.0/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpMojo.java 1970-01-01 01:00:00.000000000 +0100 -+++ maven-plugin-tools-3.6.0/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpMojo.java 2019-11-25 11:01:29.241066576 +0100 -@@ -0,0 +1,458 @@ -+ -+package org.apache.maven.plugin.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 @@ ++package org.apache.maven.plugins.maven_plugin_plugin; + +import org.apache.maven.plugin.AbstractMojo; +import org.apache.maven.plugin.MojoExecutionException; @@ -1507,7 +1058,7 @@ + @Parameter( property = "indentSize", defaultValue = "2" ) + private int indentSize; + -+ // groupId/artifactId/plugin-help.xml ++ // /META-INF/maven///plugin-help.xml + private static final String PLUGIN_HELP_PATH = + "/META-INF/maven/org.apache.maven.plugins/maven-plugin-plugin/plugin-help.xml"; + @@ -1517,10 +1068,12 @@ + throws MojoExecutionException + { + getLog().debug( "load plugin-help.xml: " + PLUGIN_HELP_PATH ); -+ InputStream is = null; -+ try ++ try ( InputStream is = getClass().getResourceAsStream( PLUGIN_HELP_PATH ) ) + { -+ is = getClass().getResourceAsStream( PLUGIN_HELP_PATH ); ++ if ( is == null ) ++ { ++ throw new MojoExecutionException( "Could not find plugin descriptor at " + PLUGIN_HELP_PATH ); ++ } + DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance(); + DocumentBuilder dBuilder = dbFactory.newDocumentBuilder(); + return dBuilder.parse( is ); @@ -1537,25 +1090,12 @@ + { + throw new MojoExecutionException( e.getMessage(), e ); + } -+ finally -+ { -+ if ( is != null ) -+ { -+ try -+ { -+ is.close(); -+ } -+ catch ( IOException e ) -+ { -+ throw new MojoExecutionException( e.getMessage(), e ); -+ } -+ } -+ } + } + + /** + * {@inheritDoc} + */ ++ @Override + public void execute() + throws MojoExecutionException + { @@ -1627,13 +1167,13 @@ + return string != null && string.length() > 0; + } + -+ private String getValue( Node node, String elementName ) ++ private static String getValue( Node node, String elementName ) + throws MojoExecutionException + { + return getSingleChild( node, elementName ).getTextContent(); + } + -+ private Node getSingleChild( Node node, String elementName ) ++ private static Node getSingleChild( Node node, String elementName ) + throws MojoExecutionException + { + List namedChild = findNamedChild( node, elementName ); @@ -1648,7 +1188,7 @@ + return namedChild.get( 0 ); + } + -+ private List findNamedChild( Node node, String elementName ) ++ private static List findNamedChild( Node node, String elementName ) + { + List result = new ArrayList(); + NodeList childNodes = node.getChildNodes(); @@ -1663,7 +1203,7 @@ + return result; + } + -+ private Node findSingleChild( Node node, String elementName ) ++ private static Node findSingleChild( Node node, String elementName ) + throws MojoExecutionException + { + List elementsByTagName = findNamedChild( node, elementName ); @@ -1894,7 +1434,7 @@ + return level; + } + -+ private String getPropertyFromExpression( String expression ) ++ private static String getPropertyFromExpression( String expression ) + { + if ( expression != null && expression.startsWith( "${" ) && expression.endsWith( "}" ) + && !expression.substring( 2 ).contains( "${" ) ) diff --git a/maven-plugin-plugin-bootstrap.spec b/maven-plugin-plugin-bootstrap.spec index d23f669..33ba513 100644 --- a/maven-plugin-plugin-bootstrap.spec +++ b/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 -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 +Patch0: 0002-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: plexus-containers-container-default +BuildRequires: maven-resolver-api +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 -%patch2 -p1 -%patch3 -p1 -%patch20 -p1 +%patch20 %pom_remove_plugin -r :maven-enforcer-plugin @@ -80,14 +87,9 @@ artifact metadata and a generic help goal. UTF-8 UTF-8" -# 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 diff --git a/maven-plugin-plugin.spec b/maven-plugin-plugin.spec index 5c8abae..377db96 100644 --- a/maven-plugin-plugin.spec +++ b/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 -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 +Patch0: 0002-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 :maven-surefire-common maven-plugin-plugin - -%pom_change_dep org.easymock:easymock:: :::test maven-plugin-tools-annotations +%pom_remove_dep org.junit:junit-bom %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 diff --git a/maven-plugin-tools-3.6.0-source-release.zip b/maven-plugin-tools-3.6.0-source-release.zip deleted file mode 100644 index 8a23342..0000000 --- a/maven-plugin-tools-3.6.0-source-release.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:89f924e29820991f1d0542e94c060ad42152a6fc164fe7231d03b6815a432456 -size 701732 diff --git a/maven-plugin-tools-3.9.0-source-release.zip b/maven-plugin-tools-3.9.0-source-release.zip new file mode 100644 index 0000000..5b9bc47 --- /dev/null +++ b/maven-plugin-tools-3.9.0-source-release.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd6aecc881ea3cc28d8d31f1db42d84dc124672dd2d98c0758fd879f5d77c982 +size 1920005 diff --git a/maven-plugin-tools-build.tar.xz b/maven-plugin-tools-build.tar.xz index af1a215..9123b67 100644 --- a/maven-plugin-tools-build.tar.xz +++ b/maven-plugin-tools-build.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59e256be79c8a271ab09da3057ac76a8d5915054f1807463e3e3a701c698f589 -size 4656 +oid sha256:2f750e3253eaed5462ac9094512c4823bcfab462154538ff202333aa7a5fe2cd +size 4860 diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec index af0749c..b7da664 100644 --- a/maven-plugin-tools.spec +++ b/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 -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 +Patch0: 0002-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