From 040c004884efc077dcce7447b8473716a2db572b Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 2 Oct 2017 14:04:06 +0100 Subject: [PATCH] Fix OSGi metadata to import cglib and asm, since we are not bundling them with jarjar --- google-guice.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index e2fa043..fc8ea2d 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -5,7 +5,7 @@ Name: google-%{short_name} Version: 4.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above License: ASL 2.0 URL: https://github.com/google/%{short_name} @@ -185,6 +185,10 @@ This package provides %{summary}. # and which are only pulling additional dependencies. %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. %pom_remove_plugin :animal-sniffer-maven-plugin core %pom_remove_plugin :animal-sniffer-maven-plugin extensions @@ -255,6 +259,10 @@ This package provides %{summary}. %changelog +* Mon Oct 02 2017 Mat Booth - 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 - 4.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild