Don't use legacy Ant artifact coordinates

This commit is contained in:
Mikolaj Izdebski 2016-10-10 18:43:57 +02:00
parent 790b604a3a
commit 966a19bd69

View File

@ -1,11 +1,11 @@
%if 0%{?fedora}
%bcond_without ant_tasks %bcond_without ant_tasks
%if 0%{?fedora}
%bcond_without maven_plugin %bcond_without maven_plugin
%endif %endif
Name: aqute-bnd Name: aqute-bnd
Version: 3.3.0 Version: 3.3.0
Release: 4%{?dist} Release: 5%{?dist}
Summary: BND Tool Summary: BND Tool
License: ASL 2.0 License: ASL 2.0
URL: http://bnd.bndtools.org/ URL: http://bnd.bndtools.org/
@ -33,7 +33,7 @@ BuildRequires: mvn(org.osgi:osgi.core)
BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.slf4j:slf4j-api)
BuildRequires: mvn(org.slf4j:slf4j-simple) BuildRequires: mvn(org.slf4j:slf4j-simple)
%if %{with ant_tasks} %if %{with ant_tasks}
BuildRequires: mvn(ant:ant) BuildRequires: mvn(org.apache.ant:ant)
%endif %endif
%if %{with maven_plugin} %if %{with maven_plugin}
BuildRequires: mvn(junit:junit) BuildRequires: mvn(junit:junit)
@ -139,7 +139,7 @@ cp -p %{SOURCE4} pom.xml
%pom_add_dep biz.aQute.bnd:aQute.libg:%{version} %pom_add_dep biz.aQute.bnd:aQute.libg:%{version}
%pom_add_dep biz.aQute.bnd:biz.aQute.bnd.annotation:%{version} %pom_add_dep biz.aQute.bnd:biz.aQute.bnd.annotation:%{version}
%if %{with ant_tasks} %if %{with ant_tasks}
%pom_add_dep ant:ant %pom_add_dep org.apache.ant:ant
%endif %endif
%pom_add_dep org.osgi:osgi.annotation %pom_add_dep org.osgi:osgi.annotation
%pom_add_dep org.osgi:osgi.core %pom_add_dep org.osgi:osgi.core
@ -201,6 +201,9 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium
%license LICENSE %license LICENSE
%changelog %changelog
* Mon Oct 10 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-5
- Don't use legacy Ant artifact coordinates
* Mon Oct 10 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-4 * Mon Oct 10 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-4
- Allow conditional builds without Ant tasks - Allow conditional builds without Ant tasks