[maven-war-plugin] 05/12: Removed MWAR-269.diff (fixed upstream)

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

commit 2826fec559600fd216d55489794823f4d91e6094
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jul 17 10:48:44 2017 +0200

    Removed MWAR-269.diff (fixed upstream)
---
 debian/changelog             |  4 +++-
 debian/patches/MWAR-269.diff | 55 --------------------------------------------
 debian/patches/series        |  1 -
 3 files changed, 3 insertions(+), 57 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b1a32a6..2f37a57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-maven-war-plugin (2.2-3) UNRELEASED; urgency=medium
+maven-war-plugin (3.1-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release:
+    - Removed MWAR-269.diff (fixed upstream)
   * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 4.0.0
   * Switch to debhelper level 10
diff --git a/debian/patches/MWAR-269.diff b/debian/patches/MWAR-269.diff
deleted file mode 100644
index a9f3caf..0000000
--- a/debian/patches/MWAR-269.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-# DP: from https://issues.apache.org/jira/browse/MWAR-269
-# DP: fix already contained in later upstream versions
-
---- a/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
-+++ b/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
-@@ -32,6 +32,7 @@ import org.apache.maven.plugin.war.util.
- import org.apache.maven.shared.filtering.MavenFilteringException;
- import org.codehaus.plexus.archiver.ArchiverException;
- import org.codehaus.plexus.archiver.UnArchiver;
-+import org.codehaus.plexus.archiver.jar.JarArchiver;
- import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
- import org.codehaus.plexus.interpolation.InterpolationException;
- import org.codehaus.plexus.util.DirectoryScanner;
-@@ -264,14 +265,14 @@ public abstract class AbstractWarPackagi
-     }
- 
-     /**
--     * Copy file from source to destination. The directories up to <code>destination</code>
-+     * Copy file or folder from source to destination. The directories up to <code>destination</code>
-      * will be created if they don't already exist. if the <code>onlyIfModified</code> flag
-      * is <tt>false</tt>, <code>destination</code> will be overwritten if it already exists. If the
-      * flag is <tt>true</tt> destination will be overwritten if it's not up to date.
-      * <p/>
-      *
-      * @param context        the packaging context
--     * @param source         an existing non-directory <code>File</code> to copy bytes from
-+     * @param source         an existing file or directory <code>File</code> to copy bytes from or assemble jar from
-      * @param destination    a non-directory <code>File</code> to write bytes to (possibly overwriting).
-      * @param targetFilename the relative path of the file from the webapp root directory
-      * @param onlyIfModified if true, copy the file only if the source has changed, always copy otherwise
-@@ -290,9 +291,21 @@ public abstract class AbstractWarPackagi
-         }
-         else
-         {
--            FileUtils.copyFile( source.getCanonicalFile(), destination );
--            // preserve timestamp
--            destination.setLastModified( source.lastModified() );
-+        	if (source.isDirectory()) {
-+        		JarArchiver jarArchiver = new JarArchiver();
-+        		try {
-+					jarArchiver.setDestFile( destination );
-+					jarArchiver.addDirectory( source.getCanonicalFile() );
-+					jarArchiver.createArchive();
-+				} catch (ArchiverException e) {
-+					// wrap ArchiverException in IOException
-+					throw new IOException(e);
-+				}        		
-+        	} else {
-+	            FileUtils.copyFile( source.getCanonicalFile(), destination );
-+	            // preserve timestamp
-+	            destination.setLastModified( source.lastModified() );
-+        	}
-             context.getLog().debug( " + " + targetFilename + " has been copied." );
-             return true;
-         }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2927438..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-MWAR-269.diff

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