diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec
index 785c73a..3a73019 100644
--- a/maven-plugin-tools.spec
+++ b/maven-plugin-tools.spec
@@ -1,6 +1,9 @@
+# bsh support is unused in fedora 33+
+%bcond_with beanshell
+
Name: maven-plugin-tools
Version: 3.6.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 0
Summary: Maven Plugin Tools
License: ASL 2.0
@@ -32,21 +35,30 @@ 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)
+%if %{with beanshell}
BuildRequires: mvn(org.beanshell:bsh)
+%endif
BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin)
BuildRequires: mvn(org.codehaus.plexus:plexus-ant-factory)
BuildRequires: mvn(org.codehaus.plexus:plexus-archiver)
+%if %{with beanshell}
BuildRequires: mvn(org.codehaus.plexus:plexus-bsh-factory)
+%endif
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)
+# removed in fedora 33 with 3.6.0
Obsoletes: maven-plugin-tools-javadoc < 0:3.6.0-1
+%if %{without beanshell}
+Obsoletes: maven-plugin-tools-beanshell < 0:3.6.0-3
+Obsoletes: maven-script-beanshell < 0:3.6.0-3
+%endif
+
%description
The Maven Plugin Tools contains the necessary tools to be able to produce Maven
Plugins in a variety of languages.
@@ -90,6 +102,7 @@ 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.
+%if %{with beanshell}
%package beanshell
Summary: Maven Plugin Tool for Beanshell
Obsoletes: maven-shared-plugin-tools-beanshell < 0:%{version}-%{release}
@@ -97,6 +110,7 @@ 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
@@ -136,12 +150,14 @@ Summary: Maven Ant Mojo Support
This package provides %{summary}, which write Maven plugins with
Ant scripts.
+%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
@@ -164,6 +180,11 @@ API documentation for %{name}.
UTF-8
UTF-8"
+%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
@@ -187,7 +208,9 @@ API documentation for %{name}.
%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
@@ -201,14 +224,19 @@ API documentation for %{name}.
%files -n maven-script-ant -f .mfiles-maven-script-ant
%license LICENSE NOTICE
+%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
+* 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.