[javamail] 04/06: Ignore an additional dependency of the javadoc plugin to work around a build failure

[Emmanuel Bourg]

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

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

commit 49746a1ae5ef9b3924c0aa437081d49fd8d2e1e7
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Jan 2 21:22:56 2016 +0100

    Ignore an additional dependency of the javadoc plugin to work around a build failure
---
 debian/changelog                             |  2 ++
 debian/patches/07-javadoc-dependencies.patch | 19 +++++++++++++++++++
 debian/patches/series                        |  1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e4ed540..315e0a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ javamail (1.5.5-1) UNRELEASED; urgency=medium
   * New upstream release
     - Refreshed the patches
     - Ignore the new Android module
+    - Ignore an additional dependency of the javadoc plugin
+      to work around a build failure
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sat, 02 Jan 2016 12:24:52 +0100
 
diff --git a/debian/patches/07-javadoc-dependencies.patch b/debian/patches/07-javadoc-dependencies.patch
new file mode 100644
index 0000000..cf32cd9
--- /dev/null
+++ b/debian/patches/07-javadoc-dependencies.patch
@@ -0,0 +1,19 @@
+Description: Ignore an additional dependency of the javadoc plugin to work around a build failure
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -638,11 +638,13 @@
+ 				<artifactId>javax.mail</artifactId>
+ 				<version>${mail.version}</version>
+ 			    </additionalDependency>
++<!--
+ 			    <additionalDependency>
+ 				<groupId>com.sun.mail</groupId>
+ 				<artifactId>gimap</artifactId>
+ 				<version>${mail.version}</version>
+ 			    </additionalDependency>
++-->
+ 			</additionalDependencies>
+ 		    </configuration>
+ 		 </plugin>
diff --git a/debian/patches/series b/debian/patches/series
index 191b84e..504bcd0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 03-disable-unstable-tests.patch
 04-disable-external-network-tests.patch
 06-maven-compiler-compatibility.patch
+07-javadoc-dependencies.patch

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