From dd777ac69c3006cb60dc1038c1cf8c0e7959291e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 16 May 2020 12:57:00 +0200 Subject: [PATCH] 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