From 0295c09acb8063bd3ef316752bdfc8c716ad9723 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Thu, 15 Oct 2020 19:20:42 +0200 Subject: [PATCH] RHEL 9.0.0 Alpha bootstrap The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/maven-plugin-tools#89eae880e5378eb00690f5b886333f132210019f --- .gitignore | 12 + 0000-ignore-jtidy-crashes.patch | 16 + 0001-Port-to-plexus-utils-3.0.24.patch | 33 ++ maven-plugin-tools.spec | 489 +++++++++++++++++++++++++ sources | 1 + 5 files changed, 551 insertions(+) create mode 100644 0000-ignore-jtidy-crashes.patch create mode 100644 0001-Port-to-plexus-utils-3.0.24.patch create mode 100644 maven-plugin-tools.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore index e69de29..83bc569 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,12 @@ +/results_* +/*.src.rpm + +/maven-plugin-tools-2.1-src.tar.gz +/maven-plugin-tools-2.6.tar.xz +/maven-plugin-tools-2.7-source-release.zip +/maven-plugin-tools-3.1-source-release.zip +/maven-plugin-tools-3.3-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/0000-ignore-jtidy-crashes.patch b/0000-ignore-jtidy-crashes.patch new file mode 100644 index 0000000..98419a5 --- /dev/null +++ b/0000-ignore-jtidy-crashes.patch @@ -0,0 +1,16 @@ +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..05fef85 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 +@@ -291,6 +291,11 @@ public final class GeneratorUtils + { + // cannot happen as every JVM must support UTF-8, see also class javadoc for java.nio.charset.Charset + } ++ catch ( NullPointerException e ) ++ { ++ // if this happens, then the JavaDoc is messed up, so just ignore it ++ return ""; ++ } + + if ( StringUtils.isEmpty( commentCleaned ) ) + { diff --git a/0001-Port-to-plexus-utils-3.0.24.patch b/0001-Port-to-plexus-utils-3.0.24.patch new file mode 100644 index 0000000..a553bef --- /dev/null +++ b/0001-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/maven-plugin-tools.spec b/maven-plugin-tools.spec new file mode 100644 index 0000000..872f63c --- /dev/null +++ b/maven-plugin-tools.spec @@ -0,0 +1,489 @@ +# ant scripting is unused in fedora 33+ +%bcond_with ant + +# bsh support is unused in fedora 33+ +%bcond_with beanshell + +Name: maven-plugin-tools +Version: 3.6.0 +Release: 7%{?dist} +Epoch: 0 +Summary: Maven Plugin Tools +License: ASL 2.0 +URL: http://maven.apache.org/plugin-tools/ +BuildArch: noarch + +Source0: https://repo1.maven.org/maven2/org/apache/maven/plugin-tools/%{name}/%{version}/%{name}-%{version}-source-release.zip + +Patch0: 0000-ignore-jtidy-crashes.patch +Patch1: 0001-Port-to-plexus-utils-3.0.24.patch + +BuildRequires: maven-local +BuildRequires: mvn(com.thoughtworks.qdox:qdox) +BuildRequires: mvn(net.sf.jtidy:jtidy) +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.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) +BuildRequires: mvn(org.apache.maven:maven-compat) +BuildRequires: mvn(org.apache.maven:maven-core) +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.velocity:velocity) +BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin) +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) + +%if %{with ant} +BuildRequires: mvn(org.apache.ant:ant) +BuildRequires: mvn(org.apache.ant:ant-launcher) +BuildRequires: mvn(org.codehaus.plexus:plexus-ant-factory) +%endif + +%if %{with beanshell} +BuildRequires: mvn(org.beanshell:bsh) +BuildRequires: mvn(org.codehaus.plexus:plexus-bsh-factory) +%endif + +# removed in fedora 33 with 3.6.0 +Obsoletes: maven-plugin-tools-javadoc < 0:3.6.0-1 + +%if %{without ant} +Obsoletes: maven-plugin-tools-ant < %{epoch}:%{version}-%{release} +Obsoletes: maven-script-ant < %{epoch}:%{version}-%{release} +%endif + +%if %{without beanshell} +Obsoletes: maven-plugin-tools-beanshell < %{epoch}:%{version}-%{release} +Obsoletes: maven-script-beanshell < %{epoch}:%{version}-%{release} +%endif + +%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. + +%if %{with ant} +%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. +%endif + +%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. + +%if %{with beanshell} +%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. +%endif + +%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. + +%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. + +%if %{with ant} +%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. +%endif + +%if %{with beanshell} +%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. +%endif + +# 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 + +%pom_remove_plugin :maven-enforcer-plugin + +%pom_xpath_inject "pom:project/pom:properties" " + UTF-8 + UTF-8" + +%if %{without ant} +%pom_disable_module maven-script-ant maven-script +%pom_disable_module maven-plugin-tools-ant maven-script +%endif + +%if %{without beanshell} +%pom_disable_module maven-script-beanshell maven-script +%pom_disable_module maven-plugin-tools-beanshell maven-script +%endif + +%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 + +%if %{with ant} +%files ant -f .mfiles-maven-plugin-tools-ant +%endif + +%files api -f .mfiles-maven-plugin-tools-api +%license LICENSE NOTICE + +%if %{with beanshell} +%files beanshell -f .mfiles-maven-plugin-tools-beanshell +%endif + +%files generators -f .mfiles-maven-plugin-tools-generators + +%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 + +%if %{with ant} +%files -n maven-script-ant -f .mfiles-maven-script-ant +%license LICENSE NOTICE +%endif + +%if %{with beanshell} +%files -n maven-script-beanshell -f .mfiles-maven-script-beanshell +%license LICENSE NOTICE +%endif + +%files javadocs -f .mfiles-javadoc +%license LICENSE NOTICE + + +%changelog +* Sat Aug 22 2020 Fabio Valentini - 0:3.6.0-7 +- Disable unused ant scripting support. + +* Tue Jul 28 2020 Fedora Release Engineering - 0:3.6.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 0:3.6.0-5 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Thu May 14 2020 Fabio Valentini - 0:3.6.0-4 +- Ignore jTidy crashes when generating maven plugin descriptors. + +* Sun Mar 29 2020 Fabio Valentini - 0:3.6.0-3 +- Disable unused beanshell support. + +* Fri Mar 27 2020 Fabio Valentini - 0:3.6.0-2 +- Rebuild for fixed maven-parent. + +* Thu Feb 27 2020 Jayashree Huttanagoudar - 0:3.6.0-1 +- Update to upstream version 3.6.0. +- Section related to javadoc is removed because in the latest upstream source javadoc module is removed. + +* Wed Jan 29 2020 Fedora Release Engineering - 0:3.5.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 0:3.5.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 0:3.5.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* 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..89d6927 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (maven-plugin-tools-3.6.0-source-release.zip) = d0028acaf5a9a083230272fa49a93c1acb9a6f8677d5609649bb95e4f27340d692b14e1987b0ddba218bc7afbd38652d04660607a97b6a932d3e4b36734dfbc3