Fix FTBFS after maven-remote-reources-plugin update

This commit is contained in:
Michael Simacek 2017-09-15 12:24:44 +03:00
parent e9cb97eca2
commit d6eadb5fd0

View File

@ -5,7 +5,7 @@
Name: maven Name: maven
Epoch: 1 Epoch: 1
Version: 3.5.0 Version: 3.5.0
Release: 6%{?dist} Release: 7%{?dist}
Summary: Java project management and project comprehension tool Summary: Java project management and project comprehension tool
License: ASL 2.0 License: ASL 2.0
URL: http://maven.apache.org/ URL: http://maven.apache.org/
@ -161,6 +161,10 @@ find -name '*.bat' -delete
sed -i 's:\r::' apache-maven/src/conf/settings.xml sed -i 's:\r::' apache-maven/src/conf/settings.xml
# Downloads dependency licenses from the Internet and aggregates them.
# We already ship the licenses in their respective packages.
rm apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
# Disable plugins which are not useful for us # Disable plugins which are not useful for us
%pom_remove_plugin -r :animal-sniffer-maven-plugin %pom_remove_plugin -r :animal-sniffer-maven-plugin
%pom_remove_plugin -r :apache-rat-plugin %pom_remove_plugin -r :apache-rat-plugin
@ -248,6 +252,9 @@ ln -sf %{_sysconfdir}/%{name}/logging %{buildroot}%{_datadir}/%{name}/conf
%changelog %changelog
* Fri Sep 15 2017 Michael Simacek <msimacek@redhat.com> - 1:3.5.0-7
- Fix FTBFS after maven-remote-reources-plugin update
* Tue Aug 08 2017 Michael Simacek <msimacek@redhat.com> - 1:3.5.0-6 * Tue Aug 08 2017 Michael Simacek <msimacek@redhat.com> - 1:3.5.0-6
- Generate build number based on package release number - Generate build number based on package release number