diff -Nru commons-vfs-2.1/debian/changelog commons-vfs-2.1/debian/changelog
--- commons-vfs-2.1/debian/changelog	2020-05-11 02:52:15.000000000 +0000
+++ commons-vfs-2.1/debian/changelog	2021-04-27 20:47:37.000000000 +0000
@@ -1,8 +1,19 @@
-commons-vfs (2.1-1~16.04.sav0) xenial; urgency=medium
+commons-vfs (2.1-2~16.04.sav0) xenial; urgency=medium
 
   * Backport to Xenial
+  * debian/compat: Set compat level to 10 (Launchpad sbuild highest for Xenial)
 
- -- Rob Savoury <savoury@savos.tech>  Sun, 10 May 2020 19:52:15 -0700
+ -- Rob Savoury <savoury@savos.tech>  Tue, 27 Apr 2021 13:47:37 -0700
+
+commons-vfs (2.1-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with Java 9 (Closes: #875353)
+  * Standards-Version updated to 4.1.3
+  * Switch to debhelper level 11
+  * Fixed the watch file
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Fri, 09 Mar 2018 12:16:40 +0100
 
 commons-vfs (2.1-1) unstable; urgency=medium
 
diff -Nru commons-vfs-2.1/debian/compat commons-vfs-2.1/debian/compat
--- commons-vfs-2.1/debian/compat	2016-07-04 22:48:47.000000000 +0000
+++ commons-vfs-2.1/debian/compat	2021-04-27 20:47:27.000000000 +0000
@@ -1 +1 @@
-9
+10
diff -Nru commons-vfs-2.1/debian/control commons-vfs-2.1/debian/control
--- commons-vfs-2.1/debian/control	2016-07-06 22:52:51.000000000 +0000
+++ commons-vfs-2.1/debian/control	2018-03-09 09:52:18.000000000 +0000
@@ -2,27 +2,31 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Damien Raude-Morvan <drazzib@debian.org>
-Build-Depends-Indep: ant-doc,
-                     junit4,
-                     libcommons-collections4-java,
-                     libcommons-collections4-java-doc,
-                     libcommons-compress-java,
-                     libcommons-httpclient-java,
-                     libcommons-httpclient-java-doc,
-                     libcommons-logging-java,
-                     libcommons-logging-java-doc,
-                     libcommons-net-java,
-                     libcommons-net-java-doc,
-                     libcommons-parent-java (>= 39),
-                     libjackrabbit-java,
-                     libjdom1-java-doc,
-                     libjsch-java,
-                     libmaven-antrun-plugin-java,
-                     libmaven-bundle-plugin-java,
-                     libmaven-javadoc-plugin-java
-Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 2.0.2~)
-Standards-Version: 3.9.8
+Uploaders:
+ Damien Raude-Morvan <drazzib@debian.org>
+Build-Depends-Indep:
+ ant-doc,
+ debhelper (>= 11),
+ default-jdk,
+ junit4,
+ libcommons-collections4-java,
+ libcommons-collections4-java-doc,
+ libcommons-compress-java,
+ libcommons-httpclient-java,
+ libcommons-httpclient-java-doc,
+ libcommons-logging-java,
+ libcommons-logging-java-doc,
+ libcommons-net-java,
+ libcommons-net-java-doc,
+ libcommons-parent-java (>= 39),
+ libjackrabbit-java,
+ libjdom1-java-doc,
+ libjsch-java,
+ libmaven-antrun-plugin-java,
+ libmaven-bundle-plugin-java,
+ libmaven-javadoc-plugin-java,
+ maven-debian-helper (>= 2.0.2~)
+Standards-Version: 4.1.3
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/commons-vfs.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/commons-vfs.git
 Homepage: http://commons.apache.org/vfs/
diff -Nru commons-vfs-2.1/debian/docs commons-vfs-2.1/debian/docs
--- commons-vfs-2.1/debian/docs	2016-07-04 22:48:47.000000000 +0000
+++ commons-vfs-2.1/debian/docs	2018-03-09 09:51:43.000000000 +0000
@@ -1,3 +1,3 @@
-RELEASE-NOTES.txt
-README.txt
 NOTICE.txt
+README.txt
+RELEASE-NOTES.txt
diff -Nru commons-vfs-2.1/debian/patches/disable_hdfs_provider.diff commons-vfs-2.1/debian/patches/disable_hdfs_provider.diff
--- commons-vfs-2.1/debian/patches/disable_hdfs_provider.diff	2016-07-06 22:41:39.000000000 +0000
+++ commons-vfs-2.1/debian/patches/disable_hdfs_provider.diff	2018-03-09 11:12:11.000000000 +0000
@@ -19,3 +19,14 @@
                </testExcludes>
              </configuration>
              <goals>
+--- a/pom.xml
++++ b/pom.xml
+@@ -261,7 +261,7 @@
+             </tag>
+           </tags>
+           <aggregate>true</aggregate>
+-          <excludePackageNames>*.webdav.*</excludePackageNames>
++          <excludePackageNames>*.webdav.*:*.hdfs.*</excludePackageNames>
+         </configuration>
+       </plugin>
+ 
diff -Nru commons-vfs-2.1/debian/patches/disable_webdav_provider.diff commons-vfs-2.1/debian/patches/disable_webdav_provider.diff
--- commons-vfs-2.1/debian/patches/disable_webdav_provider.diff	2016-07-05 09:49:03.000000000 +0000
+++ commons-vfs-2.1/debian/patches/disable_webdav_provider.diff	2018-03-09 11:04:48.000000000 +0000
@@ -43,11 +43,28 @@
          <executions>
 --- a/pom.xml
 +++ b/pom.xml
-@@ -294,6 +294,7 @@
-             </tag>
-           </tags>
-           <aggregate>true</aggregate>
-+          <excludePackageNames>*.webdav.*</excludePackageNames>
+@@ -247,6 +247,24 @@
+           </excludes>
          </configuration>
        </plugin>
-       <plugin>
++      <plugin>
++        <groupId>org.apache.maven.plugins</groupId>
++        <artifactId>maven-javadoc-plugin</artifactId>
++        <version>${commons.javadoc.version}</version>
++        <configuration>
++          <tags>
++            <tag>
++              <name>todo</name>
++              <!-- todo tag for all places -->
++              <placement>a</placement>
++              <head>To Do:</head>
++            </tag>
++          </tags>
++          <aggregate>true</aggregate>
++          <excludePackageNames>*.webdav.*</excludePackageNames>
++        </configuration>
++      </plugin>
++
+     </plugins>
+   </build>
+ 
diff -Nru commons-vfs-2.1/debian/rules commons-vfs-2.1/debian/rules
--- commons-vfs-2.1/debian/rules	2016-07-04 22:48:47.000000000 +0000
+++ commons-vfs-2.1/debian/rules	2018-03-09 10:18:30.000000000 +0000
@@ -1,9 +1,7 @@
 #!/usr/bin/make -f
 
-export JAVA_HOME = /usr/lib/jvm/default-java
-
 %:
-	dh $@ --buildsystem=maven
+	dh $@
 
 get-orig-source:
 	uscan --download-current-version --force-download --rename
diff -Nru commons-vfs-2.1/debian/watch commons-vfs-2.1/debian/watch
--- commons-vfs-2.1/debian/watch	2016-07-04 22:48:47.000000000 +0000
+++ commons-vfs-2.1/debian/watch	2018-03-09 11:15:20.000000000 +0000
@@ -1,2 +1,2 @@
 version=3
-http://www.apache.org/dist/commons/vfs/source/commons-vfs-(.*)-src\.tar\.gz debian uupdate
+https://www.apache.org/dist/commons/vfs/source/commons-vfs2-distribution-(.*)-src\.tar\.gz debian uupdate