[doxia] 25/35: Depend on libmaven-parent-java and inherit 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 doxia.

commit 4c384ba027f94bb8c2638f90b97a391a0d13bcf6
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jul 28 00:23:45 2017 +0200

    Depend on libmaven-parent-java and inherit the modello configuration
---
 debian/changelog                  |  1 +
 debian/control                    |  3 ++-
 debian/libdoxia-java.poms         |  2 +-
 debian/patches/0001-modello.patch | 20 --------------------
 4 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 920d542..0a6c634 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ doxia (1.7-1) UNRELEASED; urgency=medium
   * Removed the unused dependency on libmaven2-core-java
   * Depend on libplexus-container-default1.5-java
     instead of libplexus-containers-java
+  * Depend on libmaven-parent-java and inherit the modello configuration
   * Set the source encoding to UTF-8
   * Standards-Version updated to 4.0.0
   * Switch to debhelper level 10
diff --git a/debian/control b/debian/control
index fefbfc9..223d05c 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Build-Depends-Indep: default-jdk-doc,
                      liblog4j1.2-java-doc,
                      libmaven-doxia-tools-java,
                      libmaven-javadoc-plugin-java,
+                     libmaven-parent-java,
                      libmaven-plugin-tools-java,
                      libmaven-shade-plugin-java,
                      libmodello-maven-plugin-java,
@@ -51,7 +52,7 @@ Description: Doxia content generation framework (modules)
 
 Package: libdoxia-core-java
 Architecture: all
-Depends: ${misc:Depends}, libcommons-lang-java, libhttpclient-java, libplexus-utils-java
+Depends: ${misc:Depends}, libcommons-lang-java, libhttpclient-java, libplexus-utils-java, libmaven-parent-java
 Breaks: libdoxia-java (<= 1.1.4-2)
 Replaces: libdoxia-java (<= 1.1.4-2)
 Description: Doxia content generation framework (core)
diff --git a/debian/libdoxia-java.poms b/debian/libdoxia-java.poms
index 6a9c558..e0bae60 100644
--- a/debian/libdoxia-java.poms
+++ b/debian/libdoxia-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 --has-package-version --package=libdoxia-core-java --java-lib
+pom.xml --has-package-version --package=libdoxia-core-java --java-lib
 doxia-logging-api/pom.xml --has-package-version --package=libdoxia-core-java --java-lib
 doxia-sink-api/pom.xml --has-package-version --package=libdoxia-core-java --java-lib
 doxia-test-docs/pom.xml --ignore
diff --git a/debian/patches/0001-modello.patch b/debian/patches/0001-modello.patch
index 77899fc..0060b5d 100644
--- a/debian/patches/0001-modello.patch
+++ b/debian/patches/0001-modello.patch
@@ -81,23 +81,3 @@ Subject: modello
      }
              ]]>
            </code>
---- a/doxia-core/pom.xml
-+++ b/doxia-core/pom.xml
-@@ -127,6 +127,7 @@
-           <models>
-             <model>src/main/mdo/document.mdo</model>
-           </models>
-+          <useJava5>true</useJava5>
-         </configuration>
-       </plugin>
-     </plugins>
---- a/doxia-modules/doxia-module-fml/pom.xml
-+++ b/doxia-modules/doxia-module-fml/pom.xml
-@@ -68,6 +68,7 @@
-                 <model>src/main/mdo/fml.mdo</model>
-               </models>
-               <version>1.0.0</version>
-+              <useJava5>true</useJava5>
-             </configuration>
-           </execution>
-         </executions>

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