This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository javamail.
commit 4fba12cf979ccee4f607fbce38f33e6b3ab287a2
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Thu Dec 10 12:23:50 2015 +0100
Fixed a build failure caused by the maven-compiler-plugin >= 3.0
---
debian/changelog | 1 +
.../patches/06-maven-compiler-compatibility.patch | 46 ++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 48 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 072e676..f38c933 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ javamail (1.5.4-1) UNRELEASED; urgency=medium
* New upstream release
- Refreshed the patches
+ * Fixed a build failure caused by the maven-compiler-plugin >= 3.0
* Build with the DH sequencer instead of CDBS
* debian/watch: Modified the watched URL to catch the latest releases
diff --git a/debian/patches/06-maven-compiler-compatibility.patch
b/debian/patches/06-maven-compiler-compatibility.patch
new file mode 100644
index 0000000..92e21ef
--- /dev/null
+++ b/debian/patches/06-maven-compiler-compatibility.patch
@@ -0,0 +1,46 @@
+Description: Fix the compatibility with the compiler plugin >= 3.0.
+ Several modules are sourceless (mailapijar, smtp, pop3, imap) and repack
+ source and class files from other modules. This version of the plugin
+ attempts to compile the source files unpacked in the target/sources
+ directory and triggers compilation failures. The workaround consist
+ in disabling the plugin for these modules.
+Author: Emmanuel Bourg <ebo...@apache.org>
+Forwarded: no
+--- a/mailapijar/pom.xml
++++ b/mailapijar/pom.xml
+@@ -77,6 +77,16 @@
+
+ <build>
+ <plugins>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-compiler-plugin</artifactId>
++ <executions>
++ <execution>
++ <id>default-compile</id>
++ <phase>none</phase>
++ </execution>
++ </executions>
++ </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+--- a/parent-distrib/pom.xml
++++ b/parent-distrib/pom.xml
+@@ -62,6 +62,16 @@
+
+ <build>
+ <plugins>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-compiler-plugin</artifactId>
++ <executions>
++ <execution>
++ <id>default-compile</id>
++ <phase>none</phase>
++ </execution>
++ </executions>
++ </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
diff --git a/debian/patches/series b/debian/patches/series
index c444e3f..cb59ef9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
03-disable-unstable-tests.patch
04-disable-external-network-tests.patch
05-remove-malformed-xml.patch
+06-maven-compiler-compatibility.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/javamail.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
