This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository javamail.
commit faf4a3e17d4e6e1a8a299737c5c53a08e5e7db43
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Fri Mar 2 11:37:49 2018 +0100
Removed the module-info.java files to work around a bug with the Maven
javadoc plugin
---
debian/changelog | 2 +
debian/patches/08-remove-module-info.patch | 266 +++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 269 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index b781a4b..b67a3bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ javamail (1.6.1-1) UNRELEASED; urgency=medium
* New upstream release
- Refreshed the patches
- Removed the oldmail module from debian/libmail-java.poms
+ - Removed the module-info.java files to work around a bug
+ with the Maven javadoc plugin
* Track and download the new releases from GitHub
* Standards-Version updated to 4.1.3
* Switch to debhelper level 11
diff --git a/debian/patches/08-remove-module-info.patch
b/debian/patches/08-remove-module-info.patch
new file mode 100644
index 0000000..f2a42af
--- /dev/null
+++ b/debian/patches/08-remove-module-info.patch
@@ -0,0 +1,266 @@
+Description: Removes the module-info.java files to work around a bug with
+ the maven-javadoc-plugin which attempts to invoke javadoc with the
--module-path
+ parameter if these files are found. This breaks the build when using OpenJDK
8.
+ This patch can be removed once the default JDK is upgraded (or the plugin
fixed).
+Author: Emmanuel Bourg <ebo...@apache.org>
+Forwarded: not-needed
+--- a/imap/src/main/java/module-info.java
++++ /dev/null
+@@ -1,49 +0,0 @@
+-/*
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+- *
+- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+- *
+- * The contents of this file are subject to the terms of either the GNU
+- * General Public License Version 2 only ("GPL") or the Common Development
+- * and Distribution License("CDDL") (collectively, the "License"). You
+- * may not use this file except in compliance with the License. You can
+- * obtain a copy of the License at
+- * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+- * or LICENSE.txt. See the License for the specific
+- * language governing permissions and limitations under the License.
+- *
+- * When distributing the software, include this License Header Notice in each
+- * file and include the License file at LICENSE.txt.
+- *
+- * GPL Classpath Exception:
+- * Oracle designates this particular file as subject to the "Classpath"
+- * exception as provided by Oracle in the GPL Version 2 section of the License
+- * file that accompanied this code.
+- *
+- * Modifications:
+- * If applicable, add the following below the License Header, with the fields
+- * enclosed by brackets [] replaced by your own identifying information:
+- * "Portions Copyright [year] [name of copyright owner]"
+- *
+- * Contributor(s):
+- * If you wish your version of this file to be governed by only the CDDL or
+- * only the GPL Version 2, indicate your decision by adding "[Contributor]
+- * elects to include this software in this distribution under the [CDDL or GPL
+- * Version 2] license." If you don't indicate a single choice of license, a
+- * recipient has the option to distribute your version of this file under
+- * either the CDDL, the GPL Version 2 or to extend the choice of license to
+- * its licensees as provided above. However, if you add GPL Version 2 code
+- * and therefore, elected the GPL Version 2 license, then the option applies
+- * only if the new code is made subject to such option by the copyright
+- * holder.
+- */
+-
+-module com.sun.mail.imap {
+- exports com.sun.mail.iap;
+- exports com.sun.mail.imap;
+- exports com.sun.mail.imap.protocol;
+-
+- requires java.mail;
+- requires java.logging;
+- requires java.security.sasl;
+-}
+--- a/mailapi/src/main/java/module-info.java
++++ /dev/null
+@@ -1,56 +0,0 @@
+-/*
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+- *
+- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+- *
+- * The contents of this file are subject to the terms of either the GNU
+- * General Public License Version 2 only ("GPL") or the Common Development
+- * and Distribution License("CDDL") (collectively, the "License"). You
+- * may not use this file except in compliance with the License. You can
+- * obtain a copy of the License at
+- * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+- * or LICENSE.txt. See the License for the specific
+- * language governing permissions and limitations under the License.
+- *
+- * When distributing the software, include this License Header Notice in each
+- * file and include the License file at LICENSE.txt.
+- *
+- * GPL Classpath Exception:
+- * Oracle designates this particular file as subject to the "Classpath"
+- * exception as provided by Oracle in the GPL Version 2 section of the License
+- * file that accompanied this code.
+- *
+- * Modifications:
+- * If applicable, add the following below the License Header, with the fields
+- * enclosed by brackets [] replaced by your own identifying information:
+- * "Portions Copyright [year] [name of copyright owner]"
+- *
+- * Contributor(s):
+- * If you wish your version of this file to be governed by only the CDDL or
+- * only the GPL Version 2, indicate your decision by adding "[Contributor]
+- * elects to include this software in this distribution under the [CDDL or GPL
+- * Version 2] license." If you don't indicate a single choice of license, a
+- * recipient has the option to distribute your version of this file under
+- * either the CDDL, the GPL Version 2 or to extend the choice of license to
+- * its licensees as provided above. However, if you add GPL Version 2 code
+- * and therefore, elected the GPL Version 2 license, then the option applies
+- * only if the new code is made subject to such option by the copyright
+- * holder.
+- */
+-
+-module java.mail {
+- exports javax.mail;
+- exports javax.mail.event;
+- exports javax.mail.internet;
+- exports javax.mail.search;
+- exports javax.mail.util;
+- exports com.sun.mail.util;
+- exports com.sun.mail.auth;
+- exports com.sun.mail.handlers;
+-
+- requires transitive java.activation;
+- requires java.logging;
+- requires java.xml; // for text/xml handler
+- requires java.desktop; // for image/jpeg handler
+- requires java.security.sasl; // for OAuth2 support
+-}
+--- a/mailhandler/src/main/java/module-info.java
++++ /dev/null
+@@ -1,46 +0,0 @@
+-/*
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+- *
+- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+- *
+- * The contents of this file are subject to the terms of either the GNU
+- * General Public License Version 2 only ("GPL") or the Common Development
+- * and Distribution License("CDDL") (collectively, the "License"). You
+- * may not use this file except in compliance with the License. You can
+- * obtain a copy of the License at
+- * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+- * or LICENSE.txt. See the License for the specific
+- * language governing permissions and limitations under the License.
+- *
+- * When distributing the software, include this License Header Notice in each
+- * file and include the License file at LICENSE.txt.
+- *
+- * GPL Classpath Exception:
+- * Oracle designates this particular file as subject to the "Classpath"
+- * exception as provided by Oracle in the GPL Version 2 section of the License
+- * file that accompanied this code.
+- *
+- * Modifications:
+- * If applicable, add the following below the License Header, with the fields
+- * enclosed by brackets [] replaced by your own identifying information:
+- * "Portions Copyright [year] [name of copyright owner]"
+- *
+- * Contributor(s):
+- * If you wish your version of this file to be governed by only the CDDL or
+- * only the GPL Version 2, indicate your decision by adding "[Contributor]
+- * elects to include this software in this distribution under the [CDDL or GPL
+- * Version 2] license." If you don't indicate a single choice of license, a
+- * recipient has the option to distribute your version of this file under
+- * either the CDDL, the GPL Version 2 or to extend the choice of license to
+- * its licensees as provided above. However, if you add GPL Version 2 code
+- * and therefore, elected the GPL Version 2 license, then the option applies
+- * only if the new code is made subject to such option by the copyright
+- * holder.
+- */
+-
+-module com.sun.mail.util.logging {
+- exports com.sun.mail.util.logging;
+-
+- requires java.mail;
+- requires java.logging;
+-}
+--- a/pop3/src/main/java/module-info.java
++++ /dev/null
+@@ -1,47 +0,0 @@
+-/*
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+- *
+- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+- *
+- * The contents of this file are subject to the terms of either the GNU
+- * General Public License Version 2 only ("GPL") or the Common Development
+- * and Distribution License("CDDL") (collectively, the "License"). You
+- * may not use this file except in compliance with the License. You can
+- * obtain a copy of the License at
+- * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+- * or LICENSE.txt. See the License for the specific
+- * language governing permissions and limitations under the License.
+- *
+- * When distributing the software, include this License Header Notice in each
+- * file and include the License file at LICENSE.txt.
+- *
+- * GPL Classpath Exception:
+- * Oracle designates this particular file as subject to the "Classpath"
+- * exception as provided by Oracle in the GPL Version 2 section of the License
+- * file that accompanied this code.
+- *
+- * Modifications:
+- * If applicable, add the following below the License Header, with the fields
+- * enclosed by brackets [] replaced by your own identifying information:
+- * "Portions Copyright [year] [name of copyright owner]"
+- *
+- * Contributor(s):
+- * If you wish your version of this file to be governed by only the CDDL or
+- * only the GPL Version 2, indicate your decision by adding "[Contributor]
+- * elects to include this software in this distribution under the [CDDL or GPL
+- * Version 2] license." If you don't indicate a single choice of license, a
+- * recipient has the option to distribute your version of this file under
+- * either the CDDL, the GPL Version 2 or to extend the choice of license to
+- * its licensees as provided above. However, if you add GPL Version 2 code
+- * and therefore, elected the GPL Version 2 license, then the option applies
+- * only if the new code is made subject to such option by the copyright
+- * holder.
+- */
+-
+-module com.sun.mail.pop3 {
+- exports com.sun.mail.pop3;
+-
+- requires java.mail;
+- requires java.logging;
+- requires java.security.sasl;
+-}
+--- a/smtp/src/main/java/module-info.java
++++ /dev/null
+@@ -1,47 +0,0 @@
+-/*
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+- *
+- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+- *
+- * The contents of this file are subject to the terms of either the GNU
+- * General Public License Version 2 only ("GPL") or the Common Development
+- * and Distribution License("CDDL") (collectively, the "License"). You
+- * may not use this file except in compliance with the License. You can
+- * obtain a copy of the License at
+- * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+- * or LICENSE.txt. See the License for the specific
+- * language governing permissions and limitations under the License.
+- *
+- * When distributing the software, include this License Header Notice in each
+- * file and include the License file at LICENSE.txt.
+- *
+- * GPL Classpath Exception:
+- * Oracle designates this particular file as subject to the "Classpath"
+- * exception as provided by Oracle in the GPL Version 2 section of the License
+- * file that accompanied this code.
+- *
+- * Modifications:
+- * If applicable, add the following below the License Header, with the fields
+- * enclosed by brackets [] replaced by your own identifying information:
+- * "Portions Copyright [year] [name of copyright owner]"
+- *
+- * Contributor(s):
+- * If you wish your version of this file to be governed by only the CDDL or
+- * only the GPL Version 2, indicate your decision by adding "[Contributor]
+- * elects to include this software in this distribution under the [CDDL or GPL
+- * Version 2] license." If you don't indicate a single choice of license, a
+- * recipient has the option to distribute your version of this file under
+- * either the CDDL, the GPL Version 2 or to extend the choice of license to
+- * its licensees as provided above. However, if you add GPL Version 2 code
+- * and therefore, elected the GPL Version 2 license, then the option applies
+- * only if the new code is made subject to such option by the copyright
+- * holder.
+- */
+-
+-module com.sun.mail.smtp {
+- exports com.sun.mail.smtp;
+-
+- requires java.mail;
+- requires java.logging;
+- requires java.security.sasl;
+-}
diff --git a/debian/patches/series b/debian/patches/series
index 1593283..bd6f686 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
03-disable-unstable-tests.patch
04-disable-external-network-tests.patch
07-javadoc-dependencies.patch
+08-remove-module-info.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-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
