Fix OSGi metadata to import cglib and asm, since we are not bundling them with

jarjar
This commit is contained in:
Mat Booth 2017-10-02 14:04:06 +01:00
parent 9098db7331
commit 040c004884

View File

@ -5,7 +5,7 @@
Name: google-%{short_name} Name: google-%{short_name}
Version: 4.1 Version: 4.1
Release: 7%{?dist} Release: 8%{?dist}
Summary: Lightweight dependency injection framework for Java 5 and above Summary: Lightweight dependency injection framework for Java 5 and above
License: ASL 2.0 License: ASL 2.0
URL: https://github.com/google/%{short_name} URL: https://github.com/google/%{short_name}
@ -185,6 +185,10 @@ This package provides %{summary}.
# and which are only pulling additional dependencies. # and which are only pulling additional dependencies.
%pom_xpath_remove "pom:profile[pom:id='guice.with.jarjar']" core %pom_xpath_remove "pom:profile[pom:id='guice.with.jarjar']" core
# Fix OSGi metadata due to not using jarjar
%pom_xpath_set "pom:instructions/pom:Import-Package" \
"!com.google.inject.*,*" core
# Animal sniffer is only causing problems. Disable it for now. # Animal sniffer is only causing problems. Disable it for now.
%pom_remove_plugin :animal-sniffer-maven-plugin core %pom_remove_plugin :animal-sniffer-maven-plugin core
%pom_remove_plugin :animal-sniffer-maven-plugin extensions %pom_remove_plugin :animal-sniffer-maven-plugin extensions
@ -255,6 +259,10 @@ This package provides %{summary}.
%changelog %changelog
* Mon Oct 02 2017 Mat Booth <mat.booth@redhat.com> - 4.1-8
- Fix OSGi metadata to import cglib and asm, since we are not bundling them with
jarjar
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-7 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild