commit 909d50fd80f1940a7a4065d6f3ebf51825c5df17
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Aug 10 12:42:23 2012 +0200
Add OSGI info to descriptor.jar
maven-archetype.spec | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/maven-archetype.spec b/maven-archetype.spec
index c5eb7b2..4b68e3a 100644
--- a/maven-archetype.spec
+++ b/maven-archetype.spec
@@ -1,6 +1,6 @@
Name: maven-archetype
Version: 2.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Maven project templating toolkit
Group: Development/Libraries
@@ -151,7 +151,7 @@ Requires: %{name}-registry = %{version}-%{release}
%patch2 -p1
%patch3
-# Add OSGI info to catalog module
+# Add OSGI info to catalog and descriptor jars
pushd archetype-models/archetype-catalog
%pom_xpath_remove "pom:project/pom:packaging"
%pom_xpath_inject "pom:project" "<packaging>bundle</packaging>"
@@ -168,6 +168,22 @@ pushd archetype-models/archetype-catalog
</configuration>
</plugin>"
popd
+pushd archetype-models/archetype-descriptor
+ %pom_xpath_remove "pom:project/pom:packaging"
+ %pom_xpath_inject "pom:project" "<packaging>bundle</packaging>"
+ %pom_xpath_inject "pom:build/pom:plugins" "
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <_nouses>true</_nouses>
+ <Export-Package>org.apache.maven.archetype.metadata.*</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>"
+popd
%build
@@ -269,6 +285,9 @@ cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
%{_javadir}/%{name}/plugin.jar
%changelog
+* Thu Aug 09 2012 Gerard Ryan <galileo(a)fedoraproject.org> - 2.1-7
+- Add OSGI info to descriptor.jar
+
* Tue Aug 7 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.1-6
- Export only proper OSGI packages
- Do not generate "uses" OSGI clauses