[sisu-inject] 07/08: Include the missing resources 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-inject.

commit 4f63a461fdc8ec83ea52e1347a3524b493271c42
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jul 7 16:45:22 2015 +0200

    Include the missing resources in the jar
---
 debian/changelog                          |  1 +
 debian/patches/06-include-resources.patch | 28 ++++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9365ae0..24d608a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ sisu-inject (0.3.1-1) UNRELEASED; urgency=medium
     - Refreshed the patches
     - Reverted the scope of the guice dependency from 'provided' to 'compile'
       to remain compatible with sisu-inject 0.0.0.M5 and build Maven 3.1.
+  * Include the missing resources in the jar
   * Removed the unused build dependency on libfelix-framework-java
   * Changed the scope of the cdi-api dependency from 'provided' to 'compile'
   * debian/copyright: Fixed the Source URL
diff --git a/debian/patches/06-include-resources.patch b/debian/patches/06-include-resources.patch
new file mode 100644
index 0000000..4b19c26
--- /dev/null
+++ b/debian/patches/06-include-resources.patch
@@ -0,0 +1,28 @@
+Description: Include the resources in the jar
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/org.eclipse.sisu.inject/pom.xml
++++ b/org.eclipse.sisu.inject/pom.xml
+@@ -85,8 +85,22 @@
+ 
+   <build>
+     <sourceDirectory>src</sourceDirectory>
++    <resources>
++      <resource>
++        <directory>./</directory>
++        <includes>
++          <include>META-INF/**</include>
++        </includes>
++      </resource>
++    </resources>
+     <plugins>
+       <plugin>
++        <artifactId>maven-compiler-plugin</artifactId>
++        <configuration>
++          <proc>none</proc>
++        </configuration>
++      </plugin>
++      <plugin>
+         <groupId>org.codehaus.mojo</groupId>
+         <artifactId>build-helper-maven-plugin</artifactId>
+         <version>1.9.1</version>
diff --git a/debian/patches/series b/debian/patches/series
index f72ecd7..c035333 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02-change-packaging-type.patch
 03-add-missing-dependencies.patch
 05-guice-dependency.patch
+06-include-resources.patch

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