From 0db837c69c4336af3f35261d30b7122a0a9cd706 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:55:39 +0000 Subject: [PATCH 01/12] Remove Obsoletes --- maven-plugin-tools.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec index 03223c2..45bd702 100644 --- a/maven-plugin-tools.spec +++ b/maven-plugin-tools.spec @@ -56,7 +56,6 @@ 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. @@ -78,7 +77,6 @@ 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 @@ -86,7 +84,6 @@ 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 @@ -95,7 +92,6 @@ 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 @@ -110,7 +106,6 @@ The Maven Plugin Tools Generators provides content generation %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 @@ -130,7 +125,6 @@ Java API documentation for %{name} is contained in %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 From ddee6faaad2168d74339a045b3969f32e2250608 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 13:02:12 +0000 Subject: [PATCH 02/12] Remove explicit Epoch --- maven-plugin-tools.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec index 45bd702..0ff0aa3 100644 --- a/maven-plugin-tools.spec +++ b/maven-plugin-tools.spec @@ -1,7 +1,6 @@ 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/ From 84c148fc1c65aa1e8a70b072fd0c2fed5b54dd87 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 2 Jan 2019 09:10:55 +0100 Subject: [PATCH 03/12] Update to upstream version 3.6.0 --- .gitignore | 1 + 0001-Avoid-duplicate-MOJO-parameters.patch | 68 ------------------ ... => 0001-Port-to-plexus-utils-3.0.24.patch | 0 0002-Deal-with-nulls-from-getComment.patch | 66 ------------------ maven-plugin-tools.spec | 69 ++----------------- sources | 2 +- 6 files changed, 9 insertions(+), 197 deletions(-) delete mode 100644 0001-Avoid-duplicate-MOJO-parameters.patch rename 0003-Port-to-plexus-utils-3.0.24.patch => 0001-Port-to-plexus-utils-3.0.24.patch (100%) delete mode 100644 0002-Deal-with-nulls-from-getComment.patch diff --git a/.gitignore b/.gitignore index 38853e8..c6fd16f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ maven-plugin-tools-2.7-source-release.zip /maven-plugin-tools-3.4-source-release.zip /maven-plugin-tools-3.5-source-release.zip /maven-plugin-tools-3.5.1-source-release.zip +/maven-plugin-tools-3.6.0-source-release.zip diff --git a/0001-Avoid-duplicate-MOJO-parameters.patch b/0001-Avoid-duplicate-MOJO-parameters.patch deleted file mode 100644 index 1e010b9..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/0003-Port-to-plexus-utils-3.0.24.patch b/0001-Port-to-plexus-utils-3.0.24.patch similarity index 100% rename from 0003-Port-to-plexus-utils-3.0.24.patch rename to 0001-Port-to-plexus-utils-3.0.24.patch diff --git a/0002-Deal-with-nulls-from-getComment.patch b/0002-Deal-with-nulls-from-getComment.patch deleted file mode 100644 index de983ad..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/maven-plugin-tools.spec b/maven-plugin-tools.spec index 0ff0aa3..0d8bd55 100644 --- a/maven-plugin-tools.spec +++ b/maven-plugin-tools.spec @@ -1,6 +1,6 @@ Name: maven-plugin-tools -Version: 3.5.1 -Release: 4%{?dist} +Version: 3.6.0 +Release: 1%{?dist} Summary: Maven Plugin Tools License: ASL 2.0 URL: http://maven.apache.org/plugin-tools/ @@ -8,12 +8,9 @@ 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 +Patch0: 0001-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) @@ -21,13 +18,11 @@ 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-model) 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) @@ -110,18 +105,6 @@ 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 Provides: maven-shared-plugin-tools-model = 0:%{version}-%{release} @@ -165,15 +148,9 @@ 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" @@ -181,39 +158,6 @@ API documentation for %{name}. # 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 @@ -243,8 +187,6 @@ API documentation for %{name}. %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 @@ -261,6 +203,9 @@ API documentation for %{name}. %changelog +* Wed Jan 02 2019 Marian Koncek - 0:3.6.0-1 +- Update to upstream version 3.6.0 + * Tue Jul 31 2018 Michael Simacek - 0:3.5.1-4 - Install license files for all subpackage combinations diff --git a/sources b/sources index 7c0d0fc..89d6927 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-plugin-tools-3.5.1-source-release.zip) = 0ef29773db58f9457debba1b8d989d8809be162b7617ad5ebe7d99882d63713b28adad26fcf99ba75631aa3ecf66cdd1c17d70c9cbc08ad656614a14cc17af99 +SHA512 (maven-plugin-tools-3.6.0-source-release.zip) = d0028acaf5a9a083230272fa49a93c1acb9a6f8677d5609649bb95e4f27340d692b14e1987b0ddba218bc7afbd38652d04660607a97b6a932d3e4b36734dfbc3 From 2db348febc27ed25f080f3b4e66d49fb9368ff8a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:11 +0200 Subject: [PATCH 04/12] Mass rebuild for javapackages-tools 201901 --- maven-plugin-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec index 0d8bd55..a783f0a 100644 --- a/maven-plugin-tools.spec +++ b/maven-plugin-tools.spec @@ -1,6 +1,6 @@ Name: maven-plugin-tools Version: 3.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Maven Plugin Tools License: ASL 2.0 URL: http://maven.apache.org/plugin-tools/ @@ -203,6 +203,9 @@ API documentation for %{name}. %changelog +* Fri May 24 2019 Mikolaj Izdebski - 3.6.0-2 +- Mass rebuild for javapackages-tools 201901 + * Wed Jan 02 2019 Marian Koncek - 0:3.6.0-1 - Update to upstream version 3.6.0 From 50d79b6807f2fc1dc6002506b422a102e6272977 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 21 Aug 2019 05:04:37 +0200 Subject: [PATCH 05/12] Remove unneeded %dir --- maven-plugin-tools.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec index a783f0a..82ab9af 100644 --- a/maven-plugin-tools.spec +++ b/maven-plugin-tools.spec @@ -166,7 +166,6 @@ API documentation for %{name}. %files -f .mfiles-maven-plugin-tools -%dir %{_javadir}/%{name} %license LICENSE NOTICE %files -n maven-plugin-annotations -f .mfiles-maven-plugin-annotations From 8dd1e501241a04e1971a1bfd3cb28d20a6ed310f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 06/12] Mass rebuild for javapackages-tools 201902 --- maven-plugin-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec index 82ab9af..6a4f7e5 100644 --- a/maven-plugin-tools.spec +++ b/maven-plugin-tools.spec @@ -1,6 +1,6 @@ Name: maven-plugin-tools Version: 3.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Maven Plugin Tools License: ASL 2.0 URL: http://maven.apache.org/plugin-tools/ @@ -202,6 +202,9 @@ API documentation for %{name}. %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 3.6.0-3 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 3.6.0-2 - Mass rebuild for javapackages-tools 201901 From 02c11a011e309feb9ffc92a5ebf21444da4a1e2e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 20 Apr 2020 10:17:31 +0200 Subject: [PATCH 07/12] Disable beanshell modules --- maven-plugin-tools.spec | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec index 6a4f7e5..ee02d56 100644 --- a/maven-plugin-tools.spec +++ b/maven-plugin-tools.spec @@ -1,6 +1,6 @@ Name: maven-plugin-tools Version: 3.6.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Maven Plugin Tools License: ASL 2.0 URL: http://maven.apache.org/plugin-tools/ @@ -31,16 +31,13 @@ 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) @@ -84,13 +81,6 @@ Provides: maven-shared-plugin-tools-api = 0:%{version}-%{release} 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 -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 @@ -127,13 +117,6 @@ Summary: Maven Ant Mojo Support 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 @@ -158,6 +141,9 @@ API documentation for %{name}. # Remove test dependencies because tests are skipped anyways. %pom_xpath_remove "pom:dependency[pom:scope='test']" +%pom_disable_module maven-script-beanshell maven-script +%pom_disable_module maven-plugin-tools-beanshell maven-script + %build %mvn_build -s -f @@ -180,8 +166,6 @@ API documentation for %{name}. %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 @@ -194,14 +178,14 @@ API documentation for %{name}. %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 +* Mon Apr 20 2020 Mikolaj Izdebski - 3.6.0-4 +- Disable beanshell modules + * Tue Nov 05 2019 Mikolaj Izdebski - 3.6.0-3 - Mass rebuild for javapackages-tools 201902 From c85efa1ec88898e1000189d9af3d7b964cec9ac3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 27 Apr 2020 12:52:31 +0200 Subject: [PATCH 08/12] Reduce dependencies --- 0001-Disable-help-MOJO-generation.patch | 92 +++++++++++++++++++++++++ 0001-Port-to-plexus-utils-3.0.24.patch | 33 --------- 0002-Remove-dependency-on-jtidy.patch | 92 +++++++++++++++++++++++++ 0003-Disable-reporting.patch | 90 ++++++++++++++++++++++++ maven-plugin-tools.spec | 40 +++++++---- 5 files changed, 300 insertions(+), 47 deletions(-) create mode 100644 0001-Disable-help-MOJO-generation.patch delete mode 100644 0001-Port-to-plexus-utils-3.0.24.patch create mode 100644 0002-Remove-dependency-on-jtidy.patch create mode 100644 0003-Disable-reporting.patch 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/0001-Port-to-plexus-utils-3.0.24.patch b/0001-Port-to-plexus-utils-3.0.24.patch deleted file mode 100644 index a553bef..0000000 --- a/0001-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/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/maven-plugin-tools.spec b/maven-plugin-tools.spec index ee02d56..841e99e 100644 --- a/maven-plugin-tools.spec +++ b/maven-plugin-tools.spec @@ -8,15 +8,18 @@ BuildArch: noarch Source0: http://repo2.maven.org/maven2/org/apache/maven/plugin-tools/%{name}/%{version}/%{name}-%{version}-source-release.zip -Patch0: 0001-Port-to-plexus-utils-3.0.24.patch +Patch1: 0001-Disable-help-MOJO-generation.patch +Patch2: 0002-Remove-dependency-on-jtidy.patch +Patch3: 0003-Disable-reporting.patch BuildRequires: maven-local 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.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.surefire:maven-surefire-common) BuildRequires: mvn(org.apache.maven:maven-artifact) BuildRequires: mvn(org.apache.maven:maven-compat) BuildRequires: mvn(org.apache.maven:maven-core) @@ -24,20 +27,12 @@ BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.apache.maven:maven-plugin-api) 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.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-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.ow2.asm:asm) BuildRequires: mvn(org.ow2.asm:asm-commons) @@ -130,7 +125,9 @@ API documentation for %{name}. %prep %setup -q -%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %pom_remove_plugin :maven-enforcer-plugin @@ -139,11 +136,26 @@ API documentation for %{name}. UTF-8" # Remove test dependencies because tests are skipped anyways. -%pom_xpath_remove "pom:dependency[pom:scope='test']" +%pom_xpath_remove -r "pom:dependency[pom:scope='test']" +%pom_remove_dep -r :easymock + +%pom_xpath_remove "pom:execution[pom:id='generated-helpmojo']" maven-plugin-plugin %pom_disable_module maven-script-beanshell maven-script %pom_disable_module maven-plugin-tools-beanshell maven-script +%pom_remove_dep -r :maven-reporting-impl +%pom_remove_dep -r :maven-reporting-api +%pom_remove_dep -r :plexus-velocity +%pom_remove_dep -r :velocity +%pom_remove_dep -r :jtidy +%pom_remove_dep -r :doxia-sink-api +%pom_remove_dep -r :doxia-site-renderer + +rm maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/Plugin{Help,Xdoc}Generator.java +rm maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java + + %build %mvn_build -s -f From dd777ac69c3006cb60dc1038c1cf8c0e7959291e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 16 May 2020 12:57:00 +0200 Subject: [PATCH 09/12] Disable building of maven-script-ant --- maven-plugin-tools.spec | 45 +---------------------------------------- 1 file changed, 1 insertion(+), 44 deletions(-) diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec index 841e99e..0104de7 100644 --- a/maven-plugin-tools.spec +++ b/maven-plugin-tools.spec @@ -14,8 +14,6 @@ Patch3: 0003-Disable-reporting.patch BuildRequires: maven-local BuildRequires: mvn(com.thoughtworks.qdox:qdox) -BuildRequires: mvn(org.apache.ant:ant) -BuildRequires: mvn(org.apache.ant:ant-launcher) 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) @@ -28,7 +26,6 @@ BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven:maven-repository-metadata) 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-component-annotations) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) @@ -61,13 +58,6 @@ 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 -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 Provides: maven-shared-plugin-tools-api = 0:%{version}-%{release} @@ -90,28 +80,6 @@ Provides: maven-shared-plugin-tools-java = 0:%{version}-%{release} %description java Descriptor extractor for plugins written in Java. -%package model -Summary: Maven Plugin Metadata Model -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. - # 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 @@ -141,8 +109,7 @@ API documentation for %{name}. %pom_xpath_remove "pom:execution[pom:id='generated-helpmojo']" maven-plugin-plugin -%pom_disable_module maven-script-beanshell maven-script -%pom_disable_module maven-plugin-tools-beanshell maven-script +%pom_disable_module maven-script %pom_remove_dep -r :maven-reporting-impl %pom_remove_dep -r :maven-reporting-api @@ -173,8 +140,6 @@ rm maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport %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 @@ -182,14 +147,6 @@ rm maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport %files java -f .mfiles-maven-plugin-tools-java -%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 javadocs -f .mfiles-javadoc %license LICENSE NOTICE From a72ac7677c2f3f344e40480b49681f006e58c9c3 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 22 Jun 2020 10:31:56 +0200 Subject: [PATCH 10/12] Add license to maven-plugin-annotations subpackage --- maven-plugin-tools.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec index 0104de7..24d347a 100644 --- a/maven-plugin-tools.spec +++ b/maven-plugin-tools.spec @@ -134,6 +134,7 @@ rm maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport %license LICENSE NOTICE %files -n maven-plugin-annotations -f .mfiles-maven-plugin-annotations +%license LICENSE NOTICE %files -n maven-plugin-plugin -f .mfiles-maven-plugin-plugin From c9c531a9e6e6a8339f98455190bd1a451491efea Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 11/12] Conditionalize buildrequires in bootstrap mode --- maven-plugin-tools.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec index 24d347a..4468778 100644 --- a/maven-plugin-tools.spec +++ b/maven-plugin-tools.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: maven-plugin-tools Version: 3.6.0 Release: 4%{?dist} @@ -13,6 +15,9 @@ Patch2: 0002-Remove-dependency-on-jtidy.patch Patch3: 0003-Disable-reporting.patch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(com.thoughtworks.qdox:qdox) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) @@ -32,6 +37,7 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.ow2.asm:asm) BuildRequires: mvn(org.ow2.asm:asm-commons) +%endif %description The Maven Plugin Tools contains the necessary tools to be able to produce Maven From 67f8506bfeb406798dea091fb2125ce19d307f1b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 12/12] Turn off bootstrap mode by default --- maven-plugin-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec index 4468778..77ff021 100644 --- a/maven-plugin-tools.spec +++ b/maven-plugin-tools.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: maven-plugin-tools Version: 3.6.0