diff --git a/maven-plugin-bundle.spec b/maven-plugin-bundle.spec index a6393b2..fb5531c 100644 --- a/maven-plugin-bundle.spec +++ b/maven-plugin-bundle.spec @@ -2,7 +2,7 @@ Name: maven-plugin-bundle Version: 3.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Maven Bundle Plugin License: ASL 2.0 URL: http://felix.apache.org @@ -22,7 +22,6 @@ BuildRequires: mvn(biz.aQute.bnd:biz.aQute.bndlib) BuildRequires: mvn(net.sf.kxml:kxml2) BuildRequires: mvn(org.apache.felix:felix-parent:pom:) BuildRequires: mvn(org.apache.felix:org.apache.felix.bundlerepository) -BuildRequires: mvn(org.apache.felix:org.apache.felix.framework) BuildRequires: mvn(org.apache.felix:org.apache.felix.utils) BuildRequires: mvn(org.apache.maven.doxia:doxia-core) BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) @@ -36,10 +35,11 @@ BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl) BuildRequires: mvn(org.apache.maven.shared:maven-dependency-tree) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.jdom:jdom) -BuildRequires: mvn(org.osgi:org.osgi.core) +BuildRequires: mvn(org.osgi:osgi.core) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) BuildRequires: mvn(xpp3:xpp3) + %description Provides a maven plugin that supports creating an OSGi bundle from the contents of the compilation classpath along with its @@ -69,9 +69,10 @@ rm -r src/main/java/org/apache/maven/shared/dependency %pom_add_dep org.apache.maven:maven-compat %pom_add_dep xpp3:xpp3 %pom_add_dep net.sf.kxml:kxml2 -%pom_add_dep org.apache.felix:org.apache.felix.framework %pom_add_dep org.apache.maven.reporting:maven-reporting-impl +%pom_change_dep :org.osgi.core :osgi.core + %build # Tests depend on bundled JARs %mvn_build -f @@ -86,6 +87,9 @@ rm -r src/main/java/org/apache/maven/shared/dependency %doc LICENSE NOTICE %changelog +* Thu Oct 06 2016 Michael Simacek - 3.2.0-2 +- Use osgi APIs instead of felix-framework + * Tue Jul 19 2016 Michael Simacek - 3.2.0-1 - Update to upstream version 3.2.0