Merge ~nacc/ubuntu/+source/commons-vfs:merge into ~ubuntu-server-dev/ubuntu/+source/commons-vfs:ubuntu/devel

[Nish Aravamudan]

commons-vfs (2.0-7ubuntu1) xenial; urgency=medium

  * Merge from Debian unstable (LP: #1546717). Remaining changes:
    - Use ant build system:
      + d/control: Drop B-D's on maven-debian-helper + cdbs and add
        B-D on maven-ant-helper, maven-repo-helper.
      + d/rules, d/build-classpath, d/build.xml, d/build.properties:
        Configure build to use customized version of maven-ant-helper
        build.xml + debhelper.
      + d/libcommons-vfs-java.poms: Update to pickup build artifacts
        and remove surplus pom files.
      + d/libcommons-vfs-java-doc.install: Pickup documentation
        from core component instead of aggregated javadoc.
      + d/control: Manually set dependencies for binary packages.
    - Enabled test suite:
      + d/patches/disable_webdav_provider.diff: Update patch to
        fix test that checks for webdav support
      + d/build.xml: Ignore webdav when running tests.
  * Cherry-pick fix for VFS-521 from http://svn.apache.org/r1636224.

[James Page (james-page)]

libjackrabbit-java is in main - can you check that is is actually needed (I remember patching some tests/support out a while back).

review: Needs Fixing

[Nish Aravamudan (nacc)]

On Mon, Mar 7, 2016 at 6:47 AM, James Page <email address hidden> wrote:
> Review: Needs Fixing
>
> libjackrabbit-java is in main - can you check that is is actually needed (I remember
> patching some tests/support out a while back).

To be clear, you mean libjackrabbit-java is in universe & commons-vfs
is in main, right? It seems to be something was added in 2.0-6. I'll
check on removing it now.

diff --git a/debian/build-classpath b/debian/build-classpath
index 2eff1e8..3285de4 100644
--- a/debian/build-classpath
+++ b/debian/build-classpath
@@ -2,7 +2,11 @@
 /usr/share/java/ant-junit4.jar
 /usr/share/java/junit4.jar
 /usr/share/java/commons-logging.jar
+<<<<<<< debian/build-classpath
 /usr/share/java/commons-net2.jar
+=======
+/usr/share/java/commons-net.jar
+>>>>>>> debian/build-classpath
 /usr/share/java/commons-httpclient.jar
 /usr/share/java/commons-compress.jar
 /usr/share/java/jsch.jar
diff --git a/debian/build.properties b/debian/build.properties
index b554138..206cbad 100644
--- a/debian/build.properties
+++ b/debian/build.properties
@@ -2,7 +2,11 @@ build.javaVersion=1.5
 # Generate javadoc and link to required API packages
 javadoc.generate=true
 dependency=libcommons-logging-java
+<<<<<<< debian/build.properties
 dependency2=libcommons-net2-java
+=======
+dependency2=libcommons-net-java
+>>>>>>> debian/build.properties
 dependency3=libcommons-collections3-java
 dependency4=libcommons-httpclient-java
 maven.test.exclude=**/RunTest.java
diff --git a/debian/changelog b/debian/changelog
index 46f163f..28bb27a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,63 @@
+<<<<<<< debian/changelog
+=======
+commons-vfs (2.0-7ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian unstable (LP: #1546717).  Remaining changes:
+    - Use ant build system:
+      + d/control: Drop B-D's on maven-debian-helper + cdbs and add
+        B-D on maven-ant-helper, maven-repo-helper.
+      + d/rules, d/build-classpath, d/build.xml, d/build.properties:
+        Configure build to use customized version of maven-ant-helper
+        build.xml + debhelper.
+      + d/libcommons-vfs-java.poms: Update to pickup build artifacts
+        and remove surplus pom files.
+      + d/libcommons-vfs-java-doc.install: Pickup documentation
+        from core component instead of aggregated javadoc.
+      + d/control: Manually set dependencies for binary packages.
+    - Enabled test suite:
+      + d/patches/disable_webdav_provider.diff: Update patch to
+        fix test that checks for webdav support
+      + d/build.xml: Ignore webdav when running tests.
+  * Cherry-pick fix for VFS-521 from http://svn.apache.org/r1636224.
+
+ -- Nishanth Aravamudan <[e-mail]>  Wed, 17 Feb 2016 12:18:20 -0800
+
+commons-vfs (2.0-7) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with commons-parent 39 (enables the OSGI metadata)
+    (Closes: #811259)
+
+ -- Emmanuel Bourg <[e-mail]>  Mon, 18 Jan 2016 08:59:11 +0100
+
+commons-vfs (2.0-6) unstable; urgency=medium
+
+  * Team upload.
+  * Added the missing dependency on libjackrabbit-java (Closes: #808638)
+
+ -- Emmanuel Bourg <[e-mail]>  Wed, 30 Dec 2015 17:45:54 +0100
+
+commons-vfs (2.0-5) unstable; urgency=medium
+
+  * Team upload.
+  * Depend on libcommons-net-java instead of libcommons-net2-java
+    (Closes: #800761)
+  * Build with the DH sequencer instead of CDBS
+
+ -- Emmanuel Bourg <[e-mail]>  Mon, 07 Dec 2015 11:34:18 +0100
+
+commons-vfs (2.0-4) unstable; urgency=medium
+
+  * Team upload.
+  * Ignore the dependency on maven-scm (Closes: #797459)
+  * Standards-Version updated to 3.9.6 (no changes)
+  * Use canonical URLs for the Vcs-* fields
+  * Switch to debhelper level 9
+  * debian/copyright: Updated the Format URI
+
+ -- Emmanuel Bourg <[e-mail]>  Mon, 31 Aug 2015 16:07:05 +0200
+
+>>>>>>> debian/changelog
 commons-vfs (2.0-3ubuntu1) quantal; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index ebf5a10..e7ad195 100644
--- a/debian/control
+++ b/debian/control
@@ -13,17 +13,25 @@ Build-Depends-Indep: ant-doc,
                      libcommons-httpclient-java-doc,
                      libcommons-logging-java,
                      libcommons-logging-java-doc,
-                     libcommons-net2-java,
-                     libcommons-net2-java-doc,
-                     libcommons-parent-java,
+                     libcommons-net-java,
+                     libcommons-net-java-doc,
+                     libcommons-parent-java (>= 39),
+                     libjackrabbit-java,
                      libjdom1-java-doc,
+<<<<<<< debian/control
                      libjsch-java
 Build-Depends: debhelper (>= 7.0.50~), default-jdk, maven-ant-helper,
  maven-repo-helper (>= 1.5~)
 Standards-Version: 3.9.3
+=======
+                     libjsch-java,
+Build-Depends: debhelper (>= 9), default-jdk, maven-ant-helper,
+ maven-repo-helper (>= 1.5~)
+Standards-Version: 3.9.6
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/commons-vfs
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/commons-vfs
+>>>>>>> debian/control
 Homepage: http://commons.apache.org/vfs/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-vfs
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-vfs
 
 Package: libcommons-vfs-java
 Architecture: all
@@ -31,7 +39,11 @@ Depends: libcommons-logging-java, ${misc:Depends}
 Recommends: ant,
             libcommons-collections3-java,
             libcommons-httpclient-java,
+<<<<<<< debian/control
             libcommons-net2-java,
+=======
+            libcommons-net-java,
+>>>>>>> debian/control
             libjsch-java
 Suggests: libcommons-vfs-java-doc
 Description: Java API for accessing various filesystems
@@ -48,7 +60,11 @@ Section: doc
 Depends: libcommons-collections3-java-doc,
          libcommons-httpclient-java-doc,
          libcommons-logging-java-doc,
+<<<<<<< debian/control
          libcommons-net2-java-doc,
+=======
+         libcommons-net-java-doc,
+>>>>>>> debian/control
          ${misc:Depends}
 Recommends: default-jdk-doc
 Suggests: libcommons-vfs-java
diff --git a/debian/copyright b/debian/copyright
index f8d4a63..828ff1a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Apache Commons VFS
 Upstream-Contact: http://commons.apache.org/vfs/
 Source: http://www.apache.org/dist/commons/vfs/
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 3bd654c..db4af2b 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -17,6 +17,5 @@
 org.codehaus.mojo findbugs-maven-plugin * * * *
 org.apache.maven.plugins maven-checkstyle-plugin * * * *
 org.apache.maven.plugins maven-changes-plugin * * * *
+org.apache.maven.scm maven-scm* * * * *
 org.apache.commons commons-build-plugin * * * *
-
-org.apache.jackrabbit jackrabbit-webdav * * * *
\ No newline at end of file
diff --git a/debian/maven.rules b/debian/maven.rules
index a3477a4..e91928a 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -3,5 +3,4 @@ s/ant/org.apache.ant/ * * s/.*/debian/
 commons-collections commons-collections jar s/3\..*/3.x/
 s/jdom/org.jdom/ * * s/.*/debian/
 commons-httpclient commons-httpclient jar s/.*/3.x/
-commons-net commons-net jar s/2\..*/2.x/
 org.apache.commons commons-parent pom s/.*/debian/ * *
diff --git a/debian/patches/cherrypick-VFS-521.patch b/debian/patches/cherrypick-VFS-521.patch
new file mode 100644
index 0000000..bb5881f
--- /dev/null
+++ b/debian/patches/cherrypick-VFS-521.patch
@@ -0,0 +1,145 @@
+Description: Fix CustomRamProviderTest with Java 8
+ The testcase currently fails in Xenial with:
+
+ Testsuite: org.apache.commons.vfs2.provider.ram.test.CustomRamProviderTest
+ Tests run: 2, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.058 sec
+
+ Testcase: testRootFolderExists took 0.048 sec
+ Testcase: testSmallFS took 0.005 sec
+        Caused an ERROR
+ Self-suppression not permitted
+ java.lang.IllegalArgumentException: Self-suppression not permitted
+        at java.lang.Throwable.addSuppressed(Throwable.java:1043)
+        at java.io.FilterOutputStream.close(FilterOutputStream.java:159)
+        at org.apache.commons.vfs2.util.MonitorOutputStream.close(MonitorOutputStream.java:56)
+        at org.apache.commons.vfs2.provider.DefaultFileContent$FileContentOutputStream.close(DefaultFileContent.java:690)
+        at org.apache.commons.vfs2.provider.ram.test.CustomRamProviderTest.testSmallFS(CustomRamProviderTest.java:100)
+Caused by: java.io.IOException: FileSystem capacity (10) exceeded.
+        at org.apache.commons.vfs2.provider.ram.RamFileObject.resize(RamFileObject.java:278)
+        at org.apache.commons.vfs2.provider.ram.RamFileOutputStream.write(RamFileOutputStream.java:68)
+        at java.io.BufferedOutputStream.flushBuffer(BufferedOutputStream.java:82)
+        at java.io.BufferedOutputStream.flush(BufferedOutputStream.java:140)
+        at org.apache.commons.vfs2.util.MonitorOutputStream.flush(MonitorOutputStream.java:116)
+        at java.io.FilterOutputStream.close(FilterOutputStream.java:158)
+
+ Upstream fixed this issue in rev. 1636224:
+ http://svn.apache.org/viewvc?view=revision&revision=r1636224, referenced
+ from: https://issues.apache.org/jira/browse/VFS-521.
+ .
+Author: Nishanth Aravamudan <[e-mail]>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: http://svn.apache.org/viewvc?view=revision&revision=r1636224.
+Bug-Ubuntu: https://launchpad.net/bugs/1546717.
+Last-Update: <2016-02-17>
+
+Index: gitwd/core/src/main/java/org/apache/commons/vfs2/util/MonitorOutputStream.java
+===================================================================
+--- gitwd.orig/core/src/main/java/org/apache/commons/vfs2/util/MonitorOutputStream.java
++++ gitwd/core/src/main/java/org/apache/commons/vfs2/util/MonitorOutputStream.java
+@@ -19,6 +19,7 @@ package org.apache.commons.vfs2.util;
+ import java.io.BufferedOutputStream;
+ import java.io.IOException;
+ import java.io.OutputStream;
++import java.util.concurrent.atomic.AtomicBoolean;
+ 
+ import org.apache.commons.vfs2.FileSystemException;
+ 
+@@ -30,7 +31,7 @@ import org.apache.commons.vfs2.FileSyste
+ public class MonitorOutputStream
+     extends BufferedOutputStream
+ {
+-    private boolean finished;
++    private final AtomicBoolean finished = new AtomicBoolean(false);
+ 
+     public MonitorOutputStream(final OutputStream out)
+     {
+@@ -39,21 +40,42 @@ public class MonitorOutputStream
+ 
+     /**
+      * Closes this output stream.
++     * <p>
++     * This makes sure the buffers are flushed, close the output
++     * stream and it will call {@linek #onClose()}
++     * and re-throw last exception from any of the three.
++     * <p>
++     * This does nothing if the stream is closed already.
++     *
+      * @throws IOException if an error occurs.
+      */
+     @Override
+     public void close() throws IOException
+     {
+-        if (finished)
++        // do not use super.close()
++        // on Java 8 it might throw self suppression, see JDK-8042377
++        // in older Java it silently ignores flush() errors
++        if (finished.getAndSet(true))
+         {
+             return;
+         }
+ 
+-        // Close the output stream
+         IOException exc = null;
++
++        // flush the buffer and out stream
++        try
++        {
++            super.flush();
++        }
++        catch (final IOException ioe)
++        {
++            exc = ioe;
++        }
++
++        // close the out stream without using super.close()
+         try
+         {
+-            super.close();
++            super.out.close();
+         }
+         catch (final IOException ioe)
+         {
+@@ -70,8 +92,6 @@ public class MonitorOutputStream
+             exc = ioe;
+         }
+ 
+-        finished = true;
+-
+         if (exc != null)
+         {
+             throw exc;
+@@ -132,12 +152,12 @@ public class MonitorOutputStream
+      * check if file is still open. <br />
+      * This is a workaround for an oddity with Java's BufferedOutputStream where you can write to
+      * even if the stream has been closed
+-     * @throws FileSystemException if an error occurs.
++     * @throws FileSystemException if already closed.
+      * @since 2.0
+      */
+     protected void assertOpen() throws FileSystemException
+     {
+-        if (finished)
++        if (finished.get())
+         {
+             throw new FileSystemException("vfs.provider/closed.error");
+         }
+Index: gitwd/src/changes/changes.xml
+===================================================================
+--- gitwd.orig/src/changes/changes.xml
++++ gitwd/src/changes/changes.xml
+@@ -23,6 +23,10 @@
+ 
+   <body>
+     <release version="2.0" date="" description="Backwards incompatible update of Commons VFS to Java 5">
++      <action issue="VFS-521" dev="ecki" type="fix">
++        [Ram][Tests] Make RAM provider test pass on Java 8
++        (JDK-8042377, self-suppression not permitted, MonitorOutputStream#close()).
++      </action>
+       <action issue="VFS-348" dev="rgoers" type="fix" due-to="Stefan Bodewig">
+         Update the version of commons-net.
+       </action>
diff --git a/debian/patches/series b/debian/patches/series
index 48211a1..adf6f3e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 disable_webdav_provider.diff
 skip_examples.diff
+cherrypick-VFS-521.patch
diff --git a/debian/rules b/debian/rules
index 17f3e2a..5cb61fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
-# debian/rules for commons-vfs
 
+<<<<<<< debian/rules
 PACKAGE := $(shell dpkg-parsechangelog | grep '^Source:' | cut -f 2 -d ' ')
 VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | cut -d: -f2- | sed 's/-[^-]*$$//')
 
@@ -12,8 +12,20 @@ export ANT_ARGS=-Dbasedir=$(realpath .)/core -Dpackage=$(PACKAGE) \
     -propertyfile debian/build.properties \
     -f debian/build.xml
 
+=======
+export JAVA_HOME = /usr/lib/jvm/default-java
+PACKAGE := $(shell dpkg-parsechangelog | grep '^Source:' | cut -f 2 -d ' ')
+VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | cut -d: -f2- | sed 's/-[^-]*$$//')
+export CLASSPATH=$(shell for jar in `cat debian/build-classpath`; do if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; done)
+export ANT_ARGS=-Dbasedir=$(realpath .)/core -Dpackage=$(PACKAGE) \
+    -Dversion=$(VERSION) -Dbin.package=lib$(PACKAGE)-java \
+    -Dpom.file=$(realpath .)/core/pom.xml -Ddebian.dir=$(realpath .)/debian \
+    -propertyfile debian/build.properties \
+    -f debian/build.xml
+
+>>>>>>> debian/rules
 %:
 	dh $@ --buildsystem=ant --with maven_repo_helper
 
 get-orig-source:
-	uscan --force-download --rename
+	uscan --download-current-version --force-download --rename