diff --git a/maven-resolver.spec b/maven-resolver.spec index 4161733..e79fe33 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -1,7 +1,7 @@ Name: maven-resolver Epoch: 1 Version: 1.0.3 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 Summary: Apache Maven Artifact Resolver library URL: http://maven.apache.org/resolver/ @@ -11,6 +11,7 @@ BuildArch: noarch BuildRequires: maven-local BuildRequires: mvn(javax.inject:javax.inject) BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.httpcomponents:httpclient) BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.apache.maven.wagon:wagon-provider-api) @@ -129,6 +130,29 @@ This package provides %{summary}. %pom_remove_dep :::test maven-resolver-transport-http rm -r maven-resolver-transport-http/src/test +# generate OSGi manifests +for pom in $(find -mindepth 2 -name pom.xml) ; do + %pom_add_plugin "org.apache.felix:maven-bundle-plugin" pom.xml \ + " + + \${project.groupId}$(sed 's:./maven-resolver::;s:/pom.xml::;s:-:.:g' <<< $pom) + + + + + create-manifest + process-classes + manifest + + " +done +%pom_add_plugin "org.apache.maven.plugins:maven-jar-plugin" pom.xml \ +" + + \${project.build.outputDirectory}/META-INF/MANIFEST.MF + +" + %mvn_package :maven-resolver %mvn_alias 'org.apache.maven.resolver:maven-resolver-{*}' 'org.eclipse.aether:aether-@1' %mvn_file ':maven-resolver-{*}' %{name}/maven-resolver-@1 aether/aether-@1 @@ -159,6 +183,10 @@ rm -r maven-resolver-transport-http/src/test %license LICENSE NOTICE %changelog +* Mon May 15 2017 Mat Booth - 1:1.0.3-3 +- Restore OSGi metadata that was lost in the switch from "aether" to + "maven-resolver" + * Wed Apr 12 2017 Michael Simacek - 1:1.0.3-2 - Split into subpackages - Obsolete and provide aether