[maven] 08/10: Build depend on modello 1.8 instead of 1.4

[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 ce90b84c4d3201d553ca5d4c470eac41afd35ca4
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jul 8 21:57:09 2015 +0200

    Build depend on modello 1.8 instead of 1.4
---
 debian/changelog                           |  1 +
 debian/control                             |  2 +-
 debian/patches/dep_versions.diff           |  2 +-
 debian/patches/modello-configuration.patch | 15 +++++++++
 debian/patches/modello.diff                | 54 ------------------------------
 debian/patches/series                      |  2 +-
 6 files changed, 19 insertions(+), 57 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cc578cd..89250c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ maven (3.2.5-1) UNRELEASED; urgency=medium
     - Install the guice dependencies (aopalliance and javax.inject)
       in the /usr/share/maven/lib/ directory
     - Build depend on junit4 instead of junit
+    - Build depend on modello 1.8 instead of 1.4
   * Moved the libraries to a separate libmaven3-core-java package
   * Removed the unused dependencies on commons-codec, commons-httpclient
     and commons-logging
diff --git a/debian/control b/debian/control
index bb0d549..7360bfc 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends-Indep: ant-optional,
                      libmaven-parent-java,
                      libmaven-resources-plugin-java,
                      libmockito-java,
-                     libmodello-maven-plugin1.4-java,
+                     libmodello-maven-plugin-java (>= 1.8),
                      libplexus-classworlds2-java (>= 2.4),
                      libplexus-containers1.5-java (>= 1.5.5-2),
                      libplexus-utils2-java (>= 3.0.15),
diff --git a/debian/patches/dep_versions.diff b/debian/patches/dep_versions.diff
index f148b02..bac304c 100644
--- a/debian/patches/dep_versions.diff
+++ b/debian/patches/dep_versions.diff
@@ -36,7 +36,7 @@ Forwarded: not-needed
 +    <wagonVersion>2.x</wagonVersion>
 +    <securityDispatcherVersion>debian</securityDispatcherVersion>
 +    <cipherVersion>debian</cipherVersion>
-+    <modelloVersion>1.4.1</modelloVersion>
++    <modelloVersion>1.8.3</modelloVersion>
 +    <jxpathVersion>debian</jxpathVersion>
 +    <aetherVersion>debian</aetherVersion>
 +    <slf4jVersion>debian</slf4jVersion>
diff --git a/debian/patches/modello-configuration.patch b/debian/patches/modello-configuration.patch
new file mode 100644
index 0000000..5365318
--- /dev/null
+++ b/debian/patches/modello-configuration.patch
@@ -0,0 +1,15 @@
+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
+@@ -402,6 +402,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/modello.diff b/debian/patches/modello.diff
deleted file mode 100644
index e32679f..0000000
--- a/debian/patches/modello.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-Description: Manual set of modello 1.4.x classpath (for bootstrap)
- because otherwise upstream try to use old version.
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2012-01-21
-Forwarded: not-needed
---- a/build.xml
-+++ b/build.xml
-@@ -114,12 +114,6 @@
-     </artifact:dependencies>
-     <delete file="${basedir}/dependencies.xml" />
- 
--    <!-- Pull the dependencies for Modello -->
--    <artifact:dependencies pathId="modello.pathid" filesetId="modello.fileset">
--      <localRepository path="${maven.repo.local}" />
--      <dependency groupId="org.codehaus.modello" artifactId="modello-maven-plugin" version="${pom.properties.modelloVersion}" />
--    </artifact:dependencies>
--
-     <!-- Pull the dependencies for the MetadataGenerator CLI -->
-     <artifact:dependencies pathId="pmdg.pathid" filesetId="pmdg.fileset">
-       <localRepository path="${maven.repo.local}" />
-@@ -158,6 +152,24 @@
-   <target name="generate-sources" depends="pull" description="generates Java sources from Modello mdo model files">
-     <mkdir dir="bootstrap/target" />
-     <mkdir dir="bootstrap/target/generated-sources" />
-+    
-+    <path id="modello.pathid">
-+      <fileset dir="/usr/share/java/">
-+        <include name="plexus-build-api.jar"/>
-+        <include name="plexus-container-default.jar"/>
-+        <include name="classworlds.jar"/>
-+        <include name="guava.jar"/>
-+        <include name="xbean-reflect.jar"/>
-+        <include name="plexus-classworlds.jar"/>
-+        <include name="plexus-utils.jar"/>
-+        <include name="plexus-compiler-api.jar"/>
-+        <include name="plexus-compiler-javac.jar"/>
-+        <include name="modello-core-1.4.x.jar"/>
-+        <include name="modello-plugin-java-1.4.x.jar"/>
-+        <include name="modello-plugin-xml-1.4.x.jar"/>
-+        <include name="modello-plugin-xpp3-1.4.x.jar"/>
-+      </fileset>
-+    </path>
- 
-     <macrodef name="modello-single-mode">
-       <attribute name="file" />
-@@ -194,7 +206,7 @@
-         <modello-single-mode file="@{file}" version="@{version}" mode="xpp3-writer" />
-       </sequential>
-     </macrodef>
--
-+    
-     <macrodef name="modello-ex">
-       <attribute name="file" />
-       <attribute name="version" default="1.0.0" />
diff --git a/debian/patches/series b/debian/patches/series
index e6bcf93..c2212eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-modello.diff
 plugins_version.diff
 dep_versions.diff
 add_dependencies.diff
+modello-configuration.patch

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