commit 7fba5eaea3224efc55286a87a5d7d2b67f5aa0bf Author: James Antill Date: Mon Aug 8 12:35:37 2022 -0400 Import rpm: afc62d66ab24163dd4ad2df2792e5038e19d378c diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8c431c6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/maven-plugin-tools-3.5.1-source-release.zip diff --git a/0001-Avoid-duplicate-MOJO-parameters.patch b/0001-Avoid-duplicate-MOJO-parameters.patch new file mode 100644 index 0000000..1e010b9 --- /dev/null +++ b/0001-Avoid-duplicate-MOJO-parameters.patch @@ -0,0 +1,68 @@ +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/0001-Disable-help-MOJO-generation.patch b/0001-Disable-help-MOJO-generation.patch new file mode 100644 index 0000000..220407c --- /dev/null +++ b/0001-Disable-help-MOJO-generation.patch @@ -0,0 +1,92 @@ +From 4d7b7bbd40fb82ef78f0a27135a8dc9075d132ea Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Mon, 27 Apr 2020 12:52:15 +0200 +Subject: [PATCH 1/3] Disable help MOJO generation + +--- + .../plugin/plugin/HelpGeneratorMojo.java | 20 +------------------ + .../generator/PluginDescriptorGenerator.java | 11 ---------- + 2 files changed, 1 insertion(+), 30 deletions(-) + +diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java +index 767567b..1004867 100644 +--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java ++++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java +@@ -28,8 +28,6 @@ import org.apache.maven.plugins.annotations.Mojo; + import org.apache.maven.plugins.annotations.Parameter; + import org.apache.maven.plugins.annotations.ResolutionScope; + import org.apache.maven.tools.plugin.generator.Generator; +-import org.apache.maven.tools.plugin.generator.PluginHelpGenerator; +-import org.codehaus.plexus.velocity.VelocityComponent; + + /** + * Generates a HelpMojo class. +@@ -58,12 +56,6 @@ public class HelpGeneratorMojo + @Parameter + private String helpPackageName; + +- /** +- * Velocity component. +- */ +- @Component +- private VelocityComponent velocity; +- + /** + * {@inheritDoc} + */ +@@ -77,7 +69,7 @@ public class HelpGeneratorMojo + */ + protected Generator createGenerator() + { +- return new PluginHelpGenerator().setHelpPackageName( helpPackageName ).setVelocityComponent( this.velocity ); ++ return null; + } + + /** +@@ -86,16 +78,6 @@ public class HelpGeneratorMojo + public void execute() + throws MojoExecutionException + { +- // force value for this plugin +- skipErrorNoDescriptorsFound = true; +- +- super.execute(); +- +- if ( !project.getCompileSourceRoots().contains( outputDirectory.getAbsolutePath() ) && !skip ) +- { +- project.addCompileSourceRoot( outputDirectory.getAbsolutePath() ); +- } +- + } + + } +diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java +index 1375cae..9e3d556 100644 +--- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java ++++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java +@@ -66,22 +66,11 @@ public class PluginDescriptorGenerator + public void execute( File destinationDirectory, PluginToolsRequest request ) + throws GeneratorException + { +- // eventually rewrite help mojo class to match actual package name +- PluginHelpGenerator.rewriteHelpMojo( request, log ); +- + try + { + // write complete plugin.xml descriptor + File f = new File( destinationDirectory, "plugin.xml" ); + writeDescriptor( f, request, false ); +- +- // write plugin-help.xml help-descriptor +- MavenProject mavenProject = request.getProject(); +- +- f = new File( mavenProject.getBuild().getOutputDirectory(), +- PluginHelpGenerator.getPluginHelpPath( mavenProject ) ); +- +- writeDescriptor( f, request, true ); + } + catch ( IOException e ) + { +-- +2.25.2 + diff --git a/0002-Deal-with-nulls-from-getComment.patch b/0002-Deal-with-nulls-from-getComment.patch new file mode 100644 index 0000000..de983ad --- /dev/null +++ b/0002-Deal-with-nulls-from-getComment.patch @@ -0,0 +1,66 @@ +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..a815d2a --- /dev/null +++ b/0002-Remove-dependency-on-jtidy.patch @@ -0,0 +1,92 @@ +From 39be64eff05c5db20b863ac971d2de5707ae8017 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 + +--- + .../plugin/generator/GeneratorUtils.java | 55 +------------------ + 1 file changed, 1 insertion(+), 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 771b08b..0346778 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. +@@ -254,58 +253,6 @@ public final class GeneratorUtils + return decoded.toString(); + } + +- /** +- * 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 @@ public final class GeneratorUtils + + try + { +- parser.parse( new StringReader( makeHtmlValid( html ) ), htmlCallback, true ); ++ parser.parse( new StringReader( html ), htmlCallback, true ); + } + catch ( IOException e ) + { +-- +2.25.2 + diff --git a/0003-Disable-reporting.patch b/0003-Disable-reporting.patch new file mode 100644 index 0000000..48e9e0c --- /dev/null +++ b/0003-Disable-reporting.patch @@ -0,0 +1,90 @@ +From 8d455cd296ab9b3d762ddac71b3f51df234b66c1 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Mon, 27 Apr 2020 12:57:13 +0200 +Subject: [PATCH 3/3] Disable reporting + +--- + .../plugin/generator/GeneratorUtils.java | 62 ------------------- + 1 file changed, 62 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 0346778..6ac66f8 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 +@@ -47,7 +47,6 @@ import org.apache.maven.model.Dependency; + import org.apache.maven.plugin.descriptor.MojoDescriptor; + import org.apache.maven.plugin.descriptor.PluginDescriptor; + import org.apache.maven.project.MavenProject; +-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; +@@ -592,65 +591,4 @@ public final class GeneratorUtils + return packageName; + } + +- /** +- * @param impl a Mojo implementation, not null +- * @param project a MavenProject instance, could be null +- * @return true is the Mojo implementation implements MavenReport, +- * false otherwise. +- * @throws IllegalArgumentException if any +- */ +- @SuppressWarnings( "unchecked" ) +- public static boolean isMavenReport( String impl, MavenProject project ) +- throws IllegalArgumentException +- { +- if ( impl == null ) +- { +- throw new IllegalArgumentException( "mojo implementation should be declared" ); +- } +- +- ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); +- if ( project != null ) +- { +- List classPathStrings; +- try +- { +- classPathStrings = project.getCompileClasspathElements(); +- if ( project.getExecutionProject() != null ) +- { +- classPathStrings.addAll( project.getExecutionProject().getCompileClasspathElements() ); +- } +- } +- catch ( DependencyResolutionRequiredException e ) +- { +- throw new IllegalArgumentException( e ); +- } +- +- List urls = new ArrayList<>( classPathStrings.size() ); +- for ( String classPathString : classPathStrings ) +- { +- try +- { +- urls.add( new File( classPathString ).toURL() ); +- } +- catch ( MalformedURLException e ) +- { +- throw new IllegalArgumentException( e ); +- } +- } +- +- classLoader = new URLClassLoader( urls.toArray( new URL[urls.size()] ), classLoader ); +- } +- +- try +- { +- Class clazz = Class.forName( impl, false, classLoader ); +- +- return MavenReport.class.isAssignableFrom( clazz ); +- } +- catch ( ClassNotFoundException e ) +- { +- return false; +- } +- } +- + } +-- +2.25.2 + diff --git a/0003-Port-to-plexus-utils-3.0.24.patch b/0003-Port-to-plexus-utils-3.0.24.patch new file mode 100644 index 0000000..a553bef --- /dev/null +++ b/0003-Port-to-plexus-utils-3.0.24.patch @@ -0,0 +1,33 @@ +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/gating.yaml b/gating.yaml new file mode 100644 index 0000000..d6b7694 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - rhel-9 +decision_contexts: + - osci_compose_gate +rules: + # https://docs.engineering.redhat.com/display/RHELPLAN/Maven+Bootstrap+manual+gating+test + - !PassingTestCaseRule {test_case_name: manual.sst_cs_apps.maven.bootstrap} diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec new file mode 100644 index 0000000..03223c2 --- /dev/null +++ b/maven-plugin-tools.spec @@ -0,0 +1,466 @@ +Name: maven-plugin-tools +Version: 3.5.1 +Release: 4%{?dist} +Epoch: 0 +Summary: Maven Plugin Tools +License: ASL 2.0 +URL: http://maven.apache.org/plugin-tools/ +BuildArch: noarch + +Source0: http://repo2.maven.org/maven2/org/apache/maven/plugin-tools/%{name}/%{version}/%{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 + +BuildRequires: maven-local +BuildRequires: mvn(com.sun:tools) +BuildRequires: mvn(com.thoughtworks.qdox:qdox) +BuildRequires: mvn(net.sf.jtidy:jtidy) +BuildRequires: mvn(org.apache.ant:ant) +BuildRequires: mvn(org.apache.ant:ant-launcher) +BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) +BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer) +BuildRequires: mvn(org.apache.maven:maven-artifact) +BuildRequires: mvn(org.apache.maven:maven-artifact:2.2.1) +BuildRequires: mvn(org.apache.maven:maven-compat) +BuildRequires: mvn(org.apache.maven:maven-core) +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-plugin-registry) +BuildRequires: mvn(org.apache.maven:maven-repository-metadata) +BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-source-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.velocity:velocity) +BuildRequires: mvn(org.beanshell:bsh) +BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin) +BuildRequires: mvn(org.codehaus.plexus:plexus-ant-factory) +BuildRequires: mvn(org.codehaus.plexus:plexus-archiver) +BuildRequires: mvn(org.codehaus.plexus:plexus-bsh-factory) +BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) +BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) +BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.codehaus.plexus:plexus-velocity) +BuildRequires: mvn(org.easymock:easymock) +BuildRequires: mvn(org.ow2.asm:asm) +BuildRequires: mvn(org.ow2.asm:asm-commons) + +%description +The Maven Plugin Tools contains the necessary tools to be able to produce Maven +Plugins in a variety of languages. + +%package -n maven-plugin-annotations +Summary: Maven Plugin Java 5 Annotations +Obsoletes: maven-plugin-annotations < 0:%{version}-%{release} + +%description -n maven-plugin-annotations +This package contains Java 5 annotations to use in Mojos. + +%package -n maven-plugin-plugin +Summary: Maven Plugin Plugin + +%description -n maven-plugin-plugin +The Plugin Plugin is used to create a Maven plugin descriptor for any Mojo's +found in the source tree, to include in the JAR. It is also used to generate +Xdoc files for the Mojos as well as for updating the plugin registry, the +artifact metadata and a generic help goal. + +%package annotations +Summary: Maven Plugin Tool for Annotations + +%description annotations +This package provides Java 5 annotation tools for use with Apache Maven. + +%package ant +Summary: Maven Plugin Tool for Ant +Obsoletes: maven-shared-plugin-tools-ant < 0:%{version}-%{release} +Provides: maven-shared-plugin-tools-ant = 0:%{version}-%{release} + +%description ant +Descriptor extractor for plugins written in Ant. + +%package api +Summary: Maven Plugin Tools APIs +Obsoletes: maven-shared-plugin-tools-api < 0:%{version}-%{release} +Provides: maven-shared-plugin-tools-api = 0:%{version}-%{release} + +%description api +The Maven Plugin Tools API provides an API to extract information from +and generate documentation for Maven Plugins. + +%package beanshell +Summary: Maven Plugin Tool for Beanshell +Obsoletes: maven-shared-plugin-tools-beanshell < 0:%{version}-%{release} +Provides: maven-shared-plugin-tools-beanshell = 0:%{version}-%{release} + +%description beanshell +Descriptor extractor for plugins written in Beanshell. + +%package generators +Summary: Maven Plugin Tools Generators + +%description generators +The Maven Plugin Tools Generators provides content generation +(documentation, help) from plugin descriptor. + +%package java +Summary: Maven Plugin Tool for Java +Obsoletes: maven-shared-plugin-tools-java < 0:%{version}-%{release} +Provides: maven-shared-plugin-tools-java = 0:%{version}-%{release} + +%description java +Descriptor extractor for plugins written in Java. + +# Note that this package contains code, not documentation. +# See comments about "javadocs" subpackage below. +%package javadoc +Summary: Maven Plugin Tools Javadoc + +%description javadoc +The Maven Plugin Tools Javadoc provides several Javadoc taglets to be used when +generating Javadoc. + +Java API documentation for %{name} is contained in +%{name}-javadocs package. This package does not contain it. + +%package model +Summary: Maven Plugin Metadata Model +Obsoletes: maven-shared-plugin-tools-model < 0:%{version}-%{release} +Provides: maven-shared-plugin-tools-model = 0:%{version}-%{release} + +%description model +The Maven Plugin Metadata Model provides an API to play with the Metadata +model. + +%package -n maven-script +Summary: Maven Script Mojo Support + +%description -n maven-script +Maven Script Mojo Support lets developer write Maven plugins/goals +with scripting languages instead of compiled Java. + +%package -n maven-script-ant +Summary: Maven Ant Mojo Support + +%description -n maven-script-ant +This package provides %{summary}, which write Maven plugins with +Ant scripts. + +%package -n maven-script-beanshell +Summary: Maven Beanshell Mojo Support + +%description -n maven-script-beanshell +This package provides %{summary}, which write Maven plugins with +Beanshell scripts. + +# This "javadocs" package violates packaging guidelines as of Sep 6 2012. The +# subpackage name "javadocs" instead of "javadoc" is intentional. There was a +# consensus that current naming scheme should be kept, even if it doesn't +# conform to the guidelines. mizdebsk, September 2012 +%package javadocs +Summary: Javadoc for %{name} + +%description javadocs +API documentation for %{name}. + + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 + +%pom_remove_plugin :maven-enforcer-plugin + +# For com.sun:tools use scope "compile" instead of "system" +%pom_remove_dep com.sun:tools maven-plugin-tools-javadoc +%pom_add_dep com.sun:tools maven-plugin-tools-javadoc + +%pom_xpath_inject "pom:project/pom:properties" " + UTF-8 + UTF-8" + +# Remove test dependencies because tests are skipped anyways. +%pom_xpath_remove "pom:dependency[pom:scope='test']" + +# Use Maven 3.1.1 APIs +%pom_remove_dep :maven-project maven-plugin-plugin +%pom_remove_dep :maven-plugin-descriptor maven-plugin-plugin +%pom_remove_dep :maven-plugin-registry maven-plugin-plugin +%pom_remove_dep :maven-artifact-manager maven-plugin-plugin + +%pom_change_dep :maven-project :maven-core maven-plugin-tools-annotations +%pom_change_dep :maven-plugin-descriptor :maven-compat maven-plugin-tools-annotations + +%pom_remove_dep :maven-plugin-descriptor maven-script/maven-plugin-tools-ant +%pom_change_dep :maven-project :maven-core maven-script/maven-plugin-tools-ant + +%pom_remove_dep :maven-plugin-descriptor maven-plugin-tools-api +%pom_change_dep :maven-project :maven-core maven-plugin-tools-api + +%pom_remove_dep :maven-plugin-descriptor maven-script/maven-plugin-tools-beanshell + +%pom_remove_dep :maven-project maven-plugin-tools-generators +%pom_remove_dep :maven-plugin-descriptor maven-plugin-tools-generators + +%pom_change_dep :maven-project :maven-core maven-plugin-tools-java +%pom_remove_dep :maven-plugin-descriptor maven-plugin-tools-java + +%pom_change_dep :maven-plugin-descriptor :maven-plugin-api maven-script/maven-plugin-tools-model + +%pom_remove_dep :maven-project maven-script/maven-script-ant +%pom_remove_dep :maven-plugin-descriptor maven-script/maven-script-ant + +%pom_remove_dep :maven-project +%pom_remove_dep :maven-plugin-descriptor +%pom_add_dep org.apache.maven:maven-compat +%pom_add_dep org.apache.maven:maven-plugin-registry + +%build +%mvn_build -s -f + +%install +%mvn_install + + +%files -f .mfiles-maven-plugin-tools +%dir %{_javadir}/%{name} +%license LICENSE NOTICE + +%files -n maven-plugin-annotations -f .mfiles-maven-plugin-annotations + +%files -n maven-plugin-plugin -f .mfiles-maven-plugin-plugin + +%files annotations -f .mfiles-maven-plugin-tools-annotations +%license LICENSE NOTICE + +%files ant -f .mfiles-maven-plugin-tools-ant + +%files api -f .mfiles-maven-plugin-tools-api +%license LICENSE NOTICE + +%files beanshell -f .mfiles-maven-plugin-tools-beanshell + +%files generators -f .mfiles-maven-plugin-tools-generators + +%files java -f .mfiles-maven-plugin-tools-java + +%files javadoc -f .mfiles-maven-plugin-tools-javadoc + +%files model -f .mfiles-maven-plugin-tools-model +%license LICENSE NOTICE + +%files -n maven-script -f .mfiles-maven-script + +%files -n maven-script-ant -f .mfiles-maven-script-ant +%license LICENSE NOTICE + +%files -n maven-script-beanshell -f .mfiles-maven-script-beanshell +%license LICENSE NOTICE + +%files javadocs -f .mfiles-javadoc +%license LICENSE NOTICE + + +%changelog +* Tue Jul 31 2018 Michael Simacek - 0:3.5.1-4 +- Install license files for all subpackage combinations + +* Fri Jul 13 2018 Fedora Release Engineering - 0:3.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Feb 08 2018 Fedora Release Engineering - 0:3.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Fri Jan 26 2018 Mikolaj Izdebski - 0:3.5.1-1 +- Update to upstream version 3.5.1 + +* Fri Sep 15 2017 Michael Simacek - 0:3.5-4 +- Add missing dependency + +* Wed Jul 26 2017 Fedora Release Engineering - 0:3.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 0:3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Nov 18 2016 Michael Simacek - 0:3.5-1 +- Update to upstream version 3.5 + +* Thu May 12 2016 Mikolaj Izdebski - 0:3.4-5 +- Port to plexus-utils 3.0.24 + +* Thu Feb 04 2016 Fedora Release Engineering - 0:3.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 0:3.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Mar 16 2015 Michael Simacek - 0:3.4-2 +- Prevent NPE when setting description element + +* Mon Mar 16 2015 Michael Simacek - 0:3.4-1 +- Update to upstream version 3.4 + +* Tue Oct 28 2014 Mikolaj Izdebski - 0:3.3-4 +- Port to QDox 2.0 + +* Tue Oct 14 2014 Mikolaj Izdebski - 0:3.3-3 +- Remove legacy Obsoletes/Provides for maven2 plugin + +* Mon Oct 13 2014 Mikolaj Izdebski - 0:3.3-2 +- Port to maven-reporting-impl 2.3 + +* Thu Jun 19 2014 Michal Srb - 0:3.3-1 +- Update to upstream version 3.3 + +* Sat Jun 07 2014 Fedora Release Engineering - 0:3.1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Mar 04 2014 Stanislav Ochotnicky - 0:3.1-19 +- Use Requires: java-headless rebuild (#1067528) + +* Mon Jan 27 2014 Mikolaj Izdebski - 0:3.1-18 +- Use Maven 3.x APIs + +* Fri Jan 10 2014 Mikolaj Izdebski - 0:3.1-17 +- Remove explicit requires +- Resolves: rhbz#1051527 + +* Fri Sep 20 2013 Mikolaj Izdebski - 0:3.1-16 +- Disable test dependencies + +* Fri Sep 20 2013 Mikolaj Izdebski - 0:3.1-15 +- Fix com.sun:tools dependency + +* Thu Aug 29 2013 Michal Srb - 0:3.1-14 +- Adapt to current guidelines (Resolves: #960526) + +* Sat Aug 03 2013 Fedora Release Engineering - 0:3.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue May 7 2013 Mikolaj Izdebski - 0:3.1-12 +- Disable resolution of test artifacts + +* Thu Apr 18 2013 Mikolaj Izdebski - 0:3.1-11 +- Remove test dependencies + +* Mon Mar 11 2013 Mikolaj Izdebski - 0:3.1-10 +- Add patch for MPLUGIN-242 +- Resolves: rhbz#920042 + +* Thu Feb 14 2013 Fedora Release Engineering - 0:3.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 0:3.1-8 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Fri Dec 21 2012 Michal Srb - 0:3.1-7 +- Migrated from maven-doxia to doxia subpackage (Resolves: #889147) + +* Wed Nov 14 2012 Mikolaj Izdebski - 0:3.1-6 +- Skip running tests because they are failing + +* Tue Sep 11 2012 Mikolaj Izdebski - 0:3.1-5 +- Add missing requires + +* Tue Sep 11 2012 Mikolaj Izdebski - 0:3.1-4 +- Rebuild without bootstrap + +* Tue Sep 11 2012 Mikolaj Izdebski - 0:3.1-3 +- Add obsoletes for maven-plugin-annotations + +* Mon Sep 10 2012 Mikolaj Izdebski - 0:3.1-2 +- Bump release + +* Fri Sep 7 2012 Mikolaj Izdebski - 0:3.1-1 +- Update to upstream version 3.1 +- Bootstrap using prebuilt upstream binaries + +* Thu Sep 6 2012 Mikolaj Izdebski - 0:2.7-7 +- Remove rpm bug workaround + +* Tue Aug 28 2012 Mikolaj Izdebski - 0:2.7-6 +- Wrap descriptions at column 80 +- Install LICENSE and NOTICE files + +* Thu Jul 19 2012 Fedora Release Engineering - 0:2.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 0:2.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Nov 16 2011 Jaromir Capik - 0:2.7-3 +- Missing com.sun.javadoc / com.sun.tools.doclet forced in the POM + +* Tue Aug 16 2011 Jaromir Capik - 0:2.7-2 +- Removal of plexus-maven-plugin (not needed) +- Migration to maven3 +- Removal of unwanted file duplicates +- Minor spec file changes according to the latest guidelines + +* Sat Feb 12 2011 Alexander Kurtakov 0:2.7-1 +- Update to new upstream release. +- Adapt to current guidelines. + +* Tue Feb 08 2011 Fedora Release Engineering - 0:2.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Sep 30 2010 Stanislav Ochotnicky - 0:2.6-8 +- Remove jtidy depmap (not needed anymore) + +* Wed Sep 29 2010 Stanislav Ochotnicky - 0:2.6-7 +- Add patch for new jtidy +- Add jtidy depmap + +* Wed Sep 8 2010 Alexander Kurtakov 0:2.6-6 +- BR maven-site-plugin. +- Use javadoc:aggregate for multimodule projects. + +* Thu May 27 2010 Alexander Kurtakov 0:2.6-5 +- Add missing requires. +- Drop modello patches not needed anymore. + +* Wed May 19 2010 Alexander Kurtakov 0:2.6-4 +- Fix plugin-tools-java obsoletes. + +* Tue May 18 2010 Alexander Kurtakov 0:2.6-3 +- More BRs. + +* Tue May 18 2010 Alexander Kurtakov 0:2.6-2 +- Fix BRs. + +* Tue May 18 2010 Alexander Kurtakov 2.6-0 +- Update to 2.6. +- Separate modules as subpackages. + +* Mon Nov 23 2009 Alexander Kurtakov 0:2.1-6 +- BR maven-plugin-tools. + +* Mon Aug 31 2009 Alexander Kurtakov 0:2.1-5 +- Set minimum version for plexus-utils BR. +- BR java-devel. +- Fix javadoc subpackage description. + +* Mon Aug 31 2009 Alexander Kurtakov 0:2.1-4 +- Adapt for Fedora. + +* Wed May 20 2009 Fernando Nasser - 0:2.1-3 +- Fix license +- Fix URL + +* Mon Apr 27 2009 Yong Yang - 0:2.1-2 +- Add BRs for maven-doxia* +- Rebuild with maven2-2.0.8 built in non-bootstrap mode + +* Mon Mar 09 2009 Yong Yang - 0:2.1-1 +- Import from dbhole's maven2 2.0.8 packages + +* Mon Apr 07 2008 Deepak Bhole - 0:2.1-0jpp.1 +- Initial build diff --git a/sources b/sources new file mode 100644 index 0000000..0a24ef1 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA1 (maven-plugin-tools-3.5.1-source-release.zip) = d4a5b366f7ec8a5f6541025ad2ec9bfd35bf7210