This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository javamail.
commit 8984e371afc01e5cca7f8e0a5c9bcc64764da7ca Author: Emmanuel Bourg <[email protected]> Date: Sat Jan 2 21:31:45 2016 +0100 Removed 06-maven-compiler-compatibility.patch (fixed upstream) --- debian/changelog | 1 + .../patches/06-maven-compiler-compatibility.patch | 46 ---------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 47 deletions(-) diff --git a/debian/changelog b/debian/changelog index 315e0a6..131ac8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ javamail (1.5.5-1) UNRELEASED; urgency=medium - Ignore the new Android module - Ignore an additional dependency of the javadoc plugin to work around a build failure + - Removed 06-maven-compiler-compatibility.patch (fixed upstream) -- Emmanuel Bourg <[email protected]> Sat, 02 Jan 2016 12:24:52 +0100 diff --git a/debian/patches/06-maven-compiler-compatibility.patch b/debian/patches/06-maven-compiler-compatibility.patch deleted file mode 100644 index 92e21ef..0000000 --- a/debian/patches/06-maven-compiler-compatibility.patch +++ /dev/null @@ -1,46 +0,0 @@ -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 <[email protected]> -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 504bcd0..1593283 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,5 +2,4 @@ 02-rename-jars.patch 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 _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
