[maven2-core] 01/01: Generate the Maven settings with generics enabled

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository maven2-core.

commit c130ed75a4deef9ce9139252a85619f9bca8f27d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu May 19 11:29:22 2016 +0200

    Generate the Maven settings with generics enabled
---
 debian/build.xml | 6 +++---
 debian/changelog | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/build.xml b/debian/build.xml
index faa379e..ca74c8c 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -54,7 +54,7 @@
 
     <target name="generate-sources">
         <taskdef name="modello" classname="ModelloTask" classpath="/usr/share/java/maven-ant-helper.jar"/>
-        <modello model="maven-settings/src/main/mdo/settings.mdo" plugin="java" output="maven-settings/build/generated-sources" version="1.0.0"/>
+        <modello model="maven-settings/src/main/mdo/settings.mdo" plugin="java" output="maven-settings/build/generated-sources" version="1.0.0" useJava5="true"/>
         <modello model="maven-profile/src/main/mdo/profiles.mdo" plugin="java" output="maven-profile/build/generated-sources" version="1.0.0"/>
         <modello model="maven-plugin-parameter-documenter/src/main/mdo/paramdoc.mdo" plugin="java" output="maven-plugin-parameter-documenter/build/generated-sources" version="1.0.0"/>
         <modello model="maven-plugin-descriptor/src/main/mdo/lifecycle.mdo" plugin="java" output="maven-plugin-descriptor/build/generated-sources" version="1.0.0"/>
@@ -63,7 +63,7 @@
         <modello model="maven-model/src/main/mdo/maven.mdo" plugin="java" output="maven-model/build/generated-sources" version="4.0.0" useJava5="true"/>
         <modello model="maven-toolchain/src/main/mdo/toolchains.mdo" plugin="java" output="maven-toolchain/build/generated-sources" version="1.0.0"/>
 
-        <modello model="maven-settings/src/main/mdo/settings.mdo" plugin="xpp3-reader" output="maven-settings/build/generated-sources" version="1.0.0"/>
+        <modello model="maven-settings/src/main/mdo/settings.mdo" plugin="xpp3-reader" output="maven-settings/build/generated-sources" version="1.0.0" useJava5="true"/>
         <modello model="maven-profile/src/main/mdo/profiles.mdo" plugin="xpp3-reader" output="maven-profile/build/generated-sources" version="1.0.0"/>
         <modello model="maven-plugin-parameter-documenter/src/main/mdo/paramdoc.mdo" plugin="xpp3-reader" output="maven-plugin-parameter-documenter/build/generated-sources" version="1.0.0"/>
         <modello model="maven-plugin-descriptor/src/main/mdo/lifecycle.mdo" plugin="xpp3-reader" output="maven-plugin-descriptor/build/generated-sources" version="1.0.0"/>
@@ -72,7 +72,7 @@
         <modello model="maven-model/src/main/mdo/maven.mdo" plugin="xpp3-reader" output="maven-model/build/generated-sources" version="4.0.0" useJava5="true"/>
         <modello model="maven-toolchain/src/main/mdo/toolchains.mdo" plugin="xpp3-reader" output="maven-toolchain/build/generated-sources" version="1.0.0"/>
 
-        <modello model="maven-settings/src/main/mdo/settings.mdo" plugin="xpp3-writer" output="maven-settings/build/generated-sources" version="1.0.0"/>
+        <modello model="maven-settings/src/main/mdo/settings.mdo" plugin="xpp3-writer" output="maven-settings/build/generated-sources" version="1.0.0" useJava5="true"/>
         <modello model="maven-profile/src/main/mdo/profiles.mdo" plugin="xpp3-writer" output="maven-profile/build/generated-sources" version="1.0.0"/>
         <modello model="maven-plugin-parameter-documenter/src/main/mdo/paramdoc.mdo" plugin="xpp3-writer" output="maven-plugin-parameter-documenter/build/generated-sources" version="1.0.0"/>
         <modello model="maven-plugin-descriptor/src/main/mdo/lifecycle.mdo" plugin="xpp3-writer" output="maven-plugin-descriptor/build/generated-sources" version="1.0.0"/>
diff --git a/debian/changelog b/debian/changelog
index 5ed696e..f9d2d0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven2-core (2.2.1-26) unstable; urgency=medium
+
+  * Team upload.
+  * Generate the Maven settings with generics enabled
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 19 May 2016 11:09:15 +0200
+
 maven2-core (2.2.1-25) unstable; urgency=medium
 
   * Team upload.

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