rpms/xbean
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Introduce groovy build conditional

Browse Source
This commit is contained in:
Mikolaj Izdebski 2017-02-01 18:42:56 +01:00
parent f250f111a4
commit 760f6fa092
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xbean.spec
View File

@ -1,11 +1,12 @@
# Conditionals to help breaking eclipse <-> xbean dependency cycle # Conditionals to help breaking eclipse <-> xbean dependency cycle
# when bootstrapping for new architectures # when bootstrapping for new architectures
%bcond_without equinox %bcond_without equinox
%bcond_without groovy
%bcond_without spring %bcond_without spring
Name: xbean Name: xbean
Version: 4.5 Version: 4.5
Release: 5%{?dist} Release: 6%{?dist}
Summary: Java plugin based web server Summary: Java plugin based web server
License: ASL 2.0 License: ASL 2.0
URL: http://geronimo.apache.org/xbean/ URL: http://geronimo.apache.org/xbean/
@ -24,7 +25,6 @@ BuildRequires: mvn(commons-logging:commons-logging-api)
BuildRequires: mvn(log4j:log4j:1.2.12) BuildRequires: mvn(log4j:log4j:1.2.12)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
BuildRequires: mvn(org.codehaus.groovy:groovy-all)
BuildRequires: mvn(org.osgi:org.osgi.core) BuildRequires: mvn(org.osgi:org.osgi.core)
BuildRequires: mvn(org.ow2.asm:asm) BuildRequires: mvn(org.ow2.asm:asm)
BuildRequires: mvn(org.ow2.asm:asm-commons) BuildRequires: mvn(org.ow2.asm:asm-commons)
@ -34,6 +34,10 @@ BuildRequires: mvn(org.slf4j:slf4j-api)
BuildRequires: mvn(org.eclipse:osgi) BuildRequires: mvn(org.eclipse:osgi)
%endif %endif
%if %{with groovy}
BuildRequires: mvn(org.codehaus.groovy:groovy-all)
%endif
%if %{with spring} %if %{with spring}
BuildRequires: mvn(ant:ant) BuildRequires: mvn(ant:ant)
BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(commons-logging:commons-logging)
@ -139,6 +143,10 @@ rm src/site/site.xml
%pom_disable_module xbean-bundleutils %pom_disable_module xbean-bundleutils
%endif %endif
%if %{without groovy}
%pom_disable_module xbean-telnet
%endif
# maven-xbean-plugin invocation makes no sense as there are no namespaces # maven-xbean-plugin invocation makes no sense as there are no namespaces
%pom_remove_plugin :maven-xbean-plugin xbean-classloader %pom_remove_plugin :maven-xbean-plugin xbean-classloader
@ -179,6 +187,9 @@ sed -i "s|</Private-Package>|</Private-Package-->|" xbean-blueprint/pom.xml
%doc LICENSE NOTICE %doc LICENSE NOTICE
%changelog %changelog
* Wed Feb 1 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.5-6
- Introduce groovy build conditional
* Wed Feb 01 2017 Michael Simacek <msimacek@redhat.com> - 4.5-5 * Wed Feb 01 2017 Michael Simacek <msimacek@redhat.com> - 4.5-5
- Fix build with conditionals - Fix build with conditionals