From 02c11a011e309feb9ffc92a5ebf21444da4a1e2e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 20 Apr 2020 10:17:31 +0200 Subject: [PATCH] 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