[SCM] repository for the debian packaging of maven-ant-tasks. branch, master, updated. debian/2.1.3-2-7-gc467056

[Emmanuel Bourg]

The following commit has been merged in the master branch:
commit 7b50119383919f18633d7ae4a4fd6ee6a64354bc
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Jul 21 00:22:32 2013 +0200

    Added a patch to fix the source compatibility with Ant 1.9 (Closes: #717253)

diff --git a/debian/patches/01_ant-1.9-compatibility.patch b/debian/patches/01_ant-1.9-compatibility.patch
new file mode 100644
index 0000000..7f74524
--- /dev/null
+++ b/debian/patches/01_ant-1.9-compatibility.patch
@@ -0,0 +1,38 @@
+Description: Fixes the source compatibility with Ant 1.9
+Author: Emmanuel Bourg <ebourg at apache.org>
+Bug: http://jira.codehaus.org/browse/MANTTASKS-241
+--- a/src/main/java/org/apache/maven/artifact/ant/util/AntUtil.java
++++ b/src/main/java/org/apache/maven/artifact/ant/util/AntUtil.java
+@@ -49,9 +49,9 @@
+      * @param props properties <code>Hashtable</code> to copy to the new project.
+      * @param project the project where the properties are added
+      */
+-    public static void copyProperties( Hashtable<String,String> props, Project project )
++    public static void copyProperties( Hashtable<String,Object> props, Project project )
+     {
+-        for ( Map.Entry<String, String> entry : props.entrySet() )
++        for ( Map.Entry<String, Object> entry : props.entrySet() )
+         {
+             String key = entry.getKey();
+             if ( "basedir".equals( key ) || "ant.file".equals( key ) )
+@@ -64,7 +64,7 @@
+             if ( project.getProperty( key ) == null )
+             {
+                 // no user property
+-                project.setNewProperty( key, entry.getValue() );
++                project.setNewProperty( key, (String) entry.getValue() );
+             }
+         }
+     }
+@@ -87,9 +87,9 @@
+      * @param refs
+      * @param project
+      */
+-    public static void copyReferences( Hashtable<String,String> refs, Project project )
++    public static void copyReferences( Hashtable<String,Object> refs, Project project )
+     {
+-        for ( Map.Entry<String, String> entry : refs.entrySet() )
++        for ( Map.Entry<String, Object> entry : refs.entrySet() )
+         {
+             String key = entry.getKey();
+             // don't overwrite existing references
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e7bbfb1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_ant-1.9-compatibility.patch

-- 
repository for the debian packaging of maven-ant-tasks.