[commons-vfs] 04/06: Fixed the build failure with Java 9 (Closes: #875353)

Fri Mar 9 11:25:31 GMT 2018

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

ebourg-guest pushed a commit to branch master
in repository commons-vfs.

commit 7ecc7071e255a59cc7fb7ef3f61678a78b271302
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Mar 9 12:13:26 2018 +0100

    Fixed the build failure with Java 9 (Closes: #875353)
---
 debian/changelog                            |  1 +
 debian/patches/disable_hdfs_provider.diff   | 11 +++++++++++
 debian/patches/disable_webdav_provider.diff | 29 +++++++++++++++++++++++------
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6ca0088..f183d08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 commons-vfs (2.1-2) UNRELEASED; 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
 
diff --git a/debian/patches/disable_hdfs_provider.diff b/debian/patches/disable_hdfs_provider.diff
index d122e6d..22aa81a 100644
--- a/debian/patches/disable_hdfs_provider.diff
+++ b/debian/patches/disable_hdfs_provider.diff
@@ -19,3 +19,14 @@ Forwarded: not-needed
                </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 --git a/debian/patches/disable_webdav_provider.diff b/debian/patches/disable_webdav_provider.diff
index a09c60d..0771dd0 100644
--- a/debian/patches/disable_webdav_provider.diff
+++ b/debian/patches/disable_webdav_provider.diff
@@ -43,11 +43,28 @@ Forwarded: not-needed
          <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>
+ 

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

