[sisu-plexus] 08/09: Added the Plexus descriptor (components.xml) in the jar

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository sisu-plexus.

commit 076ef089e0de348dd4f0936f6d6613c01ef542a8
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jul 7 16:32:59 2015 +0200

    Added the Plexus descriptor (components.xml) in the jar
---
 debian/changelog                          |  1 +
 debian/patches/05-include-resources.patch | 20 ++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5d8363b..c65d866 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ sisu-plexus (0.3.1-1) UNRELEASED; urgency=medium
     - Tightened the dependency on libsisu-inject-java (>= 0.3.0)
     - Added a dependency on libosgi-core-java
   * Renamed the jar installed in /usr/share/java to sisu-plexus.jar
+  * Added the Plexus descriptor (components.xml) in the jar
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 06 Jul 2015 11:52:22 +0200
 
diff --git a/debian/patches/05-include-resources.patch b/debian/patches/05-include-resources.patch
new file mode 100644
index 0000000..9a62793
--- /dev/null
+++ b/debian/patches/05-include-resources.patch
@@ -0,0 +1,20 @@
+Description: Include the resources in the jar (and most importantly, components.xml, the Plexus components descriptor)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/org.eclipse.sisu.plexus/pom.xml
++++ b/org.eclipse.sisu.plexus/pom.xml
+@@ -97,6 +97,14 @@
+ 
+   <build>
+     <sourceDirectory>src</sourceDirectory>
++    <resources>
++      <resource>
++        <directory>./</directory>
++        <includes>
++          <include>META-INF/**</include>
++        </includes>
++      </resource>
++    </resources>
+     <plugins>
+       <plugin>
+         <groupId>org.codehaus.mojo</groupId>
diff --git a/debian/patches/series b/debian/patches/series
index b2a739e..46e0570 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01-drop-maven3-prereq.patch
 02-change-packaging-type.patch
 04-add-missing-dependencies.patch
+05-include-resources.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-plexus.git