[maven-assembly-plugin] 11/14: Added the missing useJava5 parameter to the modello configuration

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository maven-assembly-plugin.

commit 4a2f0246867fd5e3ff731f188ad9ee70e696e4bd
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jul 24 22:16:12 2017 +0200

    Added the missing useJava5 parameter to the modello configuration
---
 debian/changelog                              |  1 +
 debian/patches/01-modello-configuration.patch | 13 +++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c9a5dd9..87fa0e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ maven-assembly-plugin (3.0.0-1) UNRELEASED; urgency=medium
     - Depend on libmaven-filtering-java (>= 1.3)
     - Depend on libmaven3-core-java instead of libmaven2-core-java
     - New dependency on libmaven-artifact-transfer-java
+    - Added the missing useJava5 parameter to the modello configuration
   * Removed the unused dependency on libplexus-active-collections-java
   * Build with the DH sequencer instead of CDBS
   * Relocate the version 2.2-beta-5 used by Maven to the current one
diff --git a/debian/patches/01-modello-configuration.patch b/debian/patches/01-modello-configuration.patch
new file mode 100644
index 0000000..46fdfe3
--- /dev/null
+++ b/debian/patches/01-modello-configuration.patch
@@ -0,0 +1,13 @@
+Description: Adds the missing bits to the modello configuration that should be inherited from the ignored parent poms
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -278,6 +278,7 @@
+         <version>1.8.3</version>
+         <configuration>
+           <version>${mdoVersion}</version>
++          <useJava5>true</useJava5>
+           <models>
+             <model>src/main/mdo/assembly.mdo</model>
+             <model>src/main/mdo/assembly-component.mdo</model>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2570202
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-modello-configuration.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-assembly-plugin.git