[maven] 01/02: Depend on maven-parent 27 and removed modello-configuration.patch

[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.

commit 911fa0fba7d68c91edf2c6404c1d436042831bb4
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 20 17:37:21 2017 +0200

    Depend on maven-parent 27 and removed modello-configuration.patch
---
 debian/changelog                           |  7 +++++++
 debian/control                             |  2 +-
 debian/libmaven3-core-java.poms            |  2 +-
 debian/patches/modello-configuration.patch | 15 ---------------
 debian/patches/series                      |  1 -
 5 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b846e7f..5a27e26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven (3.5.0-6) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Depend on maven-parent 27 and removed modello-configuration.patch
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 20 Jul 2017 17:36:21 +0200
+
 maven (3.5.0-5) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 0cc194f..3082765 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends-Indep: junit4,
                      libeasymock-java,
                      libguice-java (>= 4.0),
                      liblogback-java,
-                     libmaven-parent-java,
+                     libmaven-parent-java (>= 27),
                      libmaven-resolver-java,
                      libmaven-shade-plugin-java,
                      libmaven-shared-utils-java (>= 3.1.0),
diff --git a/debian/libmaven3-core-java.poms b/debian/libmaven3-core-java.poms
index ed37aa5..e2ca743 100644
--- a/debian/libmaven3-core-java.poms
+++ b/debian/libmaven3-core-java.poms
@@ -25,7 +25,7 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-pom.xml --no-parent
+pom.xml
 apache-maven/pom.xml --ignore
 
 maven-artifact/pom.xml            --has-package-version --java-lib --usj-name=maven3-artifact
diff --git a/debian/patches/modello-configuration.patch b/debian/patches/modello-configuration.patch
deleted file mode 100644
index addb4ae..0000000
--- a/debian/patches/modello-configuration.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Copy the modello plugin configuration from the maven-parent pom
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/pom.xml
-+++ b/pom.xml
-@@ -453,6 +453,9 @@
-           <groupId>org.codehaus.modello</groupId>
-           <artifactId>modello-maven-plugin</artifactId>
-           <version>${modelloVersion}</version>
-+          <configuration>
-+            <useJava5>true</useJava5>
-+          </configuration>
-           <executions>
-             <execution>
-               <id>site-docs</id>
diff --git a/debian/patches/series b/debian/patches/series
index ed70b37..da48e0f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 plugins_version.diff
-modello-configuration.patch
 reproducible-build-timestamp.patch
 slf4j-compatibility.patch
 qdox-compatibility.patch

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