From a76ae911e0652a1f50f1d49da9bc4f82041492d4 Mon Sep 17 00:00:00 2001
From: Salman Siddiqui <sasiddiq@redhat.com>
Date: Nov 14 2018 20:09:02 +0000
Subject: [PATCH 1/15] remove unnecessary javapackages-tools and javapackages-local


---

diff --git a/dd-plist/dd-plist.spec b/dd-plist/dd-plist.spec
index dd6e622..fb5c748 100644
--- a/dd-plist/dd-plist.spec
+++ b/dd-plist/dd-plist.spec
@@ -10,10 +10,9 @@ Source0:    https://github.com/3breadt/dd-plist/archive/dd-plist-1.21.tar.gz
 
 BuildArch:  noarch
 
-BuildRequires:  javapackages-tools
-BuildRequires:  maven-assembly-plugin
 BuildRequires:  maven-local
 BuildRequires:  maven-plugin-bundle
+BuildRequires:  maven-assembly-plugin
 BuildRequires:  sonatype-oss-parent
 
 Requires:   java-openjdk
diff --git a/directory-maven-plugin/directory-maven-plugin.spec b/directory-maven-plugin/directory-maven-plugin.spec
index f43471d..acd9899 100644
--- a/directory-maven-plugin/directory-maven-plugin.spec
+++ b/directory-maven-plugin/directory-maven-plugin.spec
@@ -10,7 +10,6 @@ Source0:    https://github.com/jdcasey/directory-maven-plugin/archive/directory-
 
 BuildArch:  noarch
 
-BuildRequires:  javapackages-tools
 BuildRequires:  maven-local
 BuildRequires:  maven-parent
 BuildRequires:  maven-plugin-plugin
diff --git a/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec b/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec
index 0551461..9fb4757 100644
--- a/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec
+++ b/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec
@@ -12,9 +12,8 @@ BuildArch:  noarch
 
 Patch0: 0_update_ddp_version.patch
 
-BuildRequires:  dd-plist
-BuildRequires:  javapackages-tools
 BuildRequires:  maven-local
+BuildRequires:  dd-plist
 BuildRequires:  maven-plugin-plugin
 BuildRequires:  xz-devel
 
diff --git a/jaf/jaf.spec b/jaf/jaf.spec
index c343b87..b19b9d9 100644
--- a/jaf/jaf.spec
+++ b/jaf/jaf.spec
@@ -14,12 +14,11 @@ Patch0:		0_add_manifest.patch
 
 BuildArch:	noarch
 
+BuildRequires:	maven-local
 BuildRequires:	ee4j
 BuildRequires:	glassfish-hk2-maven-plugins
-BuildRequires:	javapackages-local
 BuildRequires:	maven-dependency-plugin
 BuildRequires:	maven-enforcer-plugin
-BuildRequires:	maven-local
 BuildRequires:	maven-plugin-build-helper
 BuildRequires:	maven-plugin-bundle
 BuildRequires:	maven-source-plugin

From 3ab7fbbddeb5a84391c0e25d0fc82a118c4b317f Mon Sep 17 00:00:00 2001
From: Salman Siddiqui <sasiddiq@redhat.com>
Date: Nov 15 2018 16:06:15 +0000
Subject: [PATCH 2/15] order BRs alphabetically


---

diff --git a/dd-plist/dd-plist.spec b/dd-plist/dd-plist.spec
index fb5c748..82eadf4 100644
--- a/dd-plist/dd-plist.spec
+++ b/dd-plist/dd-plist.spec
@@ -10,9 +10,9 @@ Source0:    https://github.com/3breadt/dd-plist/archive/dd-plist-1.21.tar.gz
 
 BuildArch:  noarch
 
+BuildRequires:  maven-assembly-plugin
 BuildRequires:  maven-local
 BuildRequires:  maven-plugin-bundle
-BuildRequires:  maven-assembly-plugin
 BuildRequires:  sonatype-oss-parent
 
 Requires:   java-openjdk
diff --git a/directory-maven-plugin/directory-maven-plugin.spec b/directory-maven-plugin/directory-maven-plugin.spec
index acd9899..23130a2 100644
--- a/directory-maven-plugin/directory-maven-plugin.spec
+++ b/directory-maven-plugin/directory-maven-plugin.spec
@@ -10,10 +10,10 @@ Source0:    https://github.com/jdcasey/directory-maven-plugin/archive/directory-
 
 BuildArch:  noarch
 
+BuildRequires:  maven-javadoc-plugin
 BuildRequires:  maven-local
 BuildRequires:  maven-parent
 BuildRequires:  maven-plugin-plugin
-BuildRequires:  maven-javadoc-plugin
 BuildRequires:  sonatype-oss-parent
 
 Requires:   java-openjdk
diff --git a/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec b/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec
index 9fb4757..ec5e449 100644
--- a/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec
+++ b/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec
@@ -12,8 +12,8 @@ BuildArch:  noarch
 
 Patch0: 0_update_ddp_version.patch
 
-BuildRequires:  maven-local
 BuildRequires:  dd-plist
+BuildRequires:  maven-local
 BuildRequires:  maven-plugin-plugin
 BuildRequires:  xz-devel
 
diff --git a/jaf/jaf.spec b/jaf/jaf.spec
index b19b9d9..2ae9e79 100644
--- a/jaf/jaf.spec
+++ b/jaf/jaf.spec
@@ -14,11 +14,11 @@ Patch0:		0_add_manifest.patch
 
 BuildArch:	noarch
 
-BuildRequires:	maven-local
 BuildRequires:	ee4j
 BuildRequires:	glassfish-hk2-maven-plugins
 BuildRequires:	maven-dependency-plugin
 BuildRequires:	maven-enforcer-plugin
+BuildRequires:	maven-local
 BuildRequires:	maven-plugin-build-helper
 BuildRequires:	maven-plugin-bundle
 BuildRequires:	maven-source-plugin
diff --git a/javamail/javamail.spec b/javamail/javamail.spec
index ade4b2a..b2471e2 100644
--- a/javamail/javamail.spec
+++ b/javamail/javamail.spec
@@ -35,16 +35,16 @@ Patch4:   4_jar_for_webapp.patch
 # add servlet module to build
 Patch5:   5_servlet_module.patch
 
-BuildRequires:  maven-local
 BuildRequires:  ee4j
 BuildRequires:  jboss-jsp-2.2-api
 BuildRequires:  glassfish-hk2-maven-plugins
 BuildRequires:  glassfish-servlet-api
 BuildRequires:  maven-dependency-plugin
 BuildRequires:  maven-enforcer-plugin
+BuildRequires:  maven-javadoc-plugin
+BuildRequires:  maven-local
 BuildRequires:  maven-plugin-build-helper
 BuildRequires:  maven-plugin-bundle
-BuildRequires:  maven-javadoc-plugin
 BuildRequires:  maven-source-plugin
 
 Requires: java-openjdk
diff --git a/jmc/jmc.spec b/jmc/jmc.spec
index d114394..a44fb4a 100644
--- a/jmc/jmc.spec
+++ b/jmc/jmc.spec
@@ -37,6 +37,7 @@ Patch7:     7_remove_buchen_repo.patch
 Patch8:     8_add_hamcrest.patch
 
 BuildRequires:  buildnumber-maven-plugin
+BuildRequires:  desktop-file-utils
 BuildRequires:  directory-maven-plugin
 BuildRequires:  eclipse-tests
 BuildRequires:  fix-info-plist-maven-plugin
@@ -48,7 +49,6 @@ BuildRequires:  maven-deploy-plugin
 BuildRequires:  maven-enforcer-plugin
 BuildRequires:  maven-local
 BuildRequires:  tycho
-BuildRequires:  desktop-file-utils
 
 Requires:       java-11-openjdk
 

From d13e883948f3998477f944b9e35d2f51b40be452 Mon Sep 17 00:00:00 2001
From: Salman Siddiqui <sasiddiq@redhat.com>
Date: Nov 15 2018 17:00:34 +0000
Subject: [PATCH 3/15] add GPLv2 with exceptions license to ee4j


incorporated comments from ee4j package review 1
see comments here: https://bugzilla.redhat.com/show_bug.cgi?id=1649570#c4

---

diff --git a/ee4j/ee4j.spec b/ee4j/ee4j.spec
index 0a315aa..e983511 100644
--- a/ee4j/ee4j.spec
+++ b/ee4j/ee4j.spec
@@ -3,7 +3,7 @@ Version:	1.0.1
 Release:	1%{?dist}
 Summary:	Parent POM file for Eclipse Enterprise for Java projects
 
-License:	EPL-2.0
+License:	EPL-2.0 or GPLv2 with exceptions
 URL:		https://github.com/eclipse-ee4j/ee4j
 
 Source0:	https://github.com/eclipse-ee4j/ee4j/archive/1.0.1.tar.gz

From 1af049e0b2c6e56f8ce629da03c52620a294ed46 Mon Sep 17 00:00:00 2001
From: Salman Siddiqui <sasiddiq@redhat.com>
Date: Nov 15 2018 17:42:23 +0000
Subject: [PATCH 4/15] use mvn()-style BRs and add javadoc subpackage for dd-plist


---

diff --git a/dd-plist/dd-plist.spec b/dd-plist/dd-plist.spec
index 82eadf4..fd5996e 100644
--- a/dd-plist/dd-plist.spec
+++ b/dd-plist/dd-plist.spec
@@ -10,12 +10,10 @@ Source0:    https://github.com/3breadt/dd-plist/archive/dd-plist-1.21.tar.gz
 
 BuildArch:  noarch
 
-BuildRequires:  maven-assembly-plugin
 BuildRequires:  maven-local
-BuildRequires:  maven-plugin-bundle
-BuildRequires:  sonatype-oss-parent
-
-Requires:   java-openjdk
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-assembly-plugin)
+BuildRequires:  mvn(org.sonatype.oss:oss-parent:pom:)
 
 %description
 This library enables your Java application to handle property lists of various
@@ -24,6 +22,12 @@ objects. They originate from the NeXSTEP programming environment and are now a
 basic part of the Cocoa framework (OS X and iOS) as well as the GNUstep 
 framework.
 
+%package javadoc
+Summary:  Javadoc for %{name}
+
+%description javadoc
+%{summary}.
+
 %global debug_package %{nil}
 
 %prep
@@ -38,11 +42,13 @@ framework.
 %install
 %mvn_install
 
-%files
-%{_javadir}/%{name}
-%{_javadocdir}/%{name}
-%{_datadir}/maven-poms/%{name}
-%{_datadir}/maven-metadata/%{name}.xml
+%files -f .mfiles
+%doc README.md
+%license LICENSE.txt
+
+%files javadoc -f .mfiles-javadoc
+%doc README.md
+%license LICENSE.txt
 
 %changelog
 * Wed Oct 17 2018 Salman Siddiqui <sasiddiq@redhat.com> - 1.21-1

From c2ee4644884d52ee715d05f8f3efea50274dcb23 Mon Sep 17 00:00:00 2001
From: Salman Siddiqui <sasiddiq@redhat.com>
Date: Nov 15 2018 18:32:21 +0000
Subject: [PATCH 5/15] use mvn()-style BRs and add javadoc subpackage for directory-maven-plugin


---

diff --git a/directory-maven-plugin/directory-maven-plugin.spec b/directory-maven-plugin/directory-maven-plugin.spec
index 23130a2..e4cbd30 100644
--- a/directory-maven-plugin/directory-maven-plugin.spec
+++ b/directory-maven-plugin/directory-maven-plugin.spec
@@ -10,13 +10,14 @@ Source0:    https://github.com/jdcasey/directory-maven-plugin/archive/directory-
 
 BuildArch:  noarch
 
-BuildRequires:  maven-javadoc-plugin
 BuildRequires:  maven-local
-BuildRequires:  maven-parent
-BuildRequires:  maven-plugin-plugin
-BuildRequires:  sonatype-oss-parent
-
-Requires:   java-openjdk
+BuildRequires:  mvn(org.apache.maven:maven-core)
+BuildRequires:  mvn(org.apache.maven:maven-model)
+BuildRequires:  mvn(org.apache.maven:maven-parent:pom:)
+BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
+BuildRequires:  mvn(org.sonatype.oss:oss-parent:pom:)
+BuildRequires:  mvn(junit:junit)
 
 %description
 The Directory Plugin for Maven is used to discover various project-related 
@@ -27,6 +28,12 @@ from disk (not resolved from a remote repository). The plugin will then reflect
 this value to the console, and also inject it into each project's properties 
 using the value of the property plugin parameter.
 
+%package javadoc
+Summary:  Javadoc for %{name}
+
+%description javadoc
+%{summary}.
+
 %global debug_package %{nil}
 
 %prep
@@ -38,11 +45,12 @@ using the value of the property plugin parameter.
 %install
 %mvn_install
 
-%files
-%{_javadir}/%{name}
-%{_javadocdir}/%{name}
-%{_datadir}/maven-poms/%{name}
-%{_datadir}/maven-metadata/%{name}.xml
+%files -f .mfiles
+%doc README.md
+%license LICENSE
+
+%files javadoc -f .mfiles-javadoc
+%doc README.md
 
 %changelog
 * Mon Oct 15 2018 Salman Siddiqui <sasiddiq@redhat.com> - 0.3.1-1

From 006445343be77a0a2bb26a4a22262325b031ae03 Mon Sep 17 00:00:00 2001
From: Salman Siddiqui <sasiddiq@redhat.com>
Date: Nov 15 2018 18:42:38 +0000
Subject: [PATCH 6/15] use mvn()-style BRs and add javadoc subpackage for owasp-java-encoder


---

diff --git a/owasp-java-encoder/owasp-java-encoder.spec b/owasp-java-encoder/owasp-java-encoder.spec
index fbe0ab7..13eceab 100644
--- a/owasp-java-encoder/owasp-java-encoder.spec
+++ b/owasp-java-encoder/owasp-java-encoder.spec
@@ -8,15 +8,14 @@ URL:		https://github.com/OWASP/owasp-java-encoder/
 
 Source0:	https://github.com/OWASP/owasp-java-encoder/archive/v1.2.1.tar.gz
 
+# add OSGi metadata
 Patch0:		0_manifest.patch
 
 BuildArch:	noarch
 
 BuildRequires:	maven-local
-BuildRequires:	maven-source-plugin
-BuildRequires:	sonatype-oss-parent
-
-Requires:	java-openjdk
+BuildRequires:	mvn(org.apache.maven.plugins:maven-source-plugin)
+BuildRequires:  mvn(org.sonatype.oss:oss-parent:pom:)
 
 %description
 The OWASP Encoders package is a collection of high-performance low-overhead
@@ -24,13 +23,18 @@ contextual encoders, that when utilized correctly, is an effective tool in
 preventing Web Application security vulnerabilities such as
 Cross-Site Scripting.
 
+%package javadoc
+Summary:  Javadoc for %{name}
+
+%description javadoc
+%{summary}.
+
 %prep
 %setup -q
 
-# add OSGi metadata
 %patch0 -p1
 
-# analysis tool for testing coverage - not required
+# analysis tool for testing coverage is not required
 %pom_remove_plugin :cobertura-maven-plugin
 
 %build
@@ -42,13 +46,13 @@ jar ufm %{_builddir}/%{name}-%{version}/core/target/encoder-%{version}.jar %{_bu
 %install
 %mvn_install
 
-%files
+%files -f .mfiles
+%doc README.md
 %license LICENSE
+
+%files javadoc -f .mfiles-javadoc
 %doc README.md
-/usr/share/java/%{name}
-/usr/share/javadoc/%{name}
-/usr/share/maven-poms/%{name}
-/usr/share/maven-metadata/%{name}.xml
+%license LICENSE
 
 %changelog
 * Wed Aug 08 2018 Salman Siddiqui <sasiddiq@redhat.com> - 1.2.1-1

From 48e652794bc8379bb4dae1ccffd5dc8e49812353 Mon Sep 17 00:00:00 2001
From: Salman Siddiqui <sasiddiq@redhat.com>
Date: Nov 15 2018 22:44:45 +0000
Subject: [PATCH 7/15] use mvn()-style BRs and replace patches with pom_* macros in javamail spec


---

diff --git a/javamail/0_ignore_broken_tests.patch b/javamail/0_ignore_broken_tests.patch
deleted file mode 100644
index 31e5548..0000000
--- a/javamail/0_ignore_broken_tests.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Nur javamail-1.6.1-orig/mail/src/test/java/com/sun/mail/util/WriteTimeoutSocketTest.java javamail-1.6.1/mail/src/test/java/com/sun/mail/util/WriteTimeoutSocketTest.java
---- javamail-1.6.1-orig/mail/src/test/java/com/sun/mail/util/WriteTimeoutSocketTest.java	2018-08-09 11:02:16.588430253 -0400
-+++ javamail-1.6.1/mail/src/test/java/com/sun/mail/util/WriteTimeoutSocketTest.java	2018-08-10 12:58:32.251319814 -0400
-@@ -62,6 +62,7 @@
- import com.sun.mail.test.TestSSLSocketFactory;
- 
- import org.junit.Test;
-+import org.junit.Ignore;
- import org.junit.Rule;
- import org.junit.rules.Timeout;
- import static org.junit.Assert.fail;
-@@ -110,6 +111,7 @@
-     /**
-      * Test write timeouts with SSL sockets.
-      */
-+    @Ignore
-     @Test
-     public void testSSL() {
- 	final Properties properties = new Properties();
-@@ -126,6 +128,7 @@
-     /**
-      * Test write timeouts with a custom SSL socket factory.
-      */
-+    @Ignore
-     @Test
-     public void testSSLSocketFactory() throws Exception {
- 	final Properties properties = new Properties();
diff --git a/javamail/0_module_info.patch b/javamail/0_module_info.patch
new file mode 100644
index 0000000..8b094b8
--- /dev/null
+++ b/javamail/0_module_info.patch
@@ -0,0 +1,955 @@
+diff -Nur javamail-1.6.3-orig/android/activation/src/main/java/module-info.java javamail-1.6.3/android/activation/src/main/java/module-info.java
+--- javamail-1.6.3-orig/android/activation/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
++++ javamail-1.6.3/android/activation/src/main/java/module-info.java	2018-10-16 15:03:36.837406588 -0400
+@@ -0,0 +1,49 @@
++/*
++ * 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.android.activation {
++
++    exports com.sun.mail.android.activation;
++	exports com.sun.activation.registries;
++	exports javax.activation;
++
++	requires java.desktop;
++	requires java.logging;
++}
+diff -Nur javamail-1.6.3-orig/android/mail/src/main/java/module-info.java javamail-1.6.3/android/mail/src/main/java/module-info.java
+--- javamail-1.6.3-orig/android/mail/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
++++ javamail-1.6.3/android/mail/src/main/java/module-info.java	2018-10-16 15:03:36.838406583 -0400
+@@ -0,0 +1,47 @@
++/*
++ * 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.android.mail {
++
++	exports com.sun.mail.android.mail;
++	exports com.sun.mail.handlers;
++
++	requires android.activation;
++}
+diff -Nur javamail-1.6.3-orig/android/src/main/java/module-info.java javamail-1.6.3/android/src/main/java/module-info.java
+--- javamail-1.6.3-orig/android/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
++++ javamail-1.6.3/android/src/main/java/module-info.java	2018-10-16 15:03:36.838406583 -0400
+@@ -0,0 +1,46 @@
++/*
++ * 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.android {
++
++	exports com.sun.mail.android;
++	exports com.sun.mail.android.activation;
++	exports com.sun.mail.android.mail;
++}
+diff -Nur javamail-1.6.3-orig/client/src/main/java/module-info.java javamail-1.6.3/client/src/main/java/module-info.java
+--- javamail-1.6.3-orig/client/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
++++ javamail-1.6.3/client/src/main/java/module-info.java	2018-10-16 15:03:36.838406583 -0400
+@@ -0,0 +1,44 @@
++/*
++ * 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.client {
++
++	exports com.sun.mail.client;
++}
+diff -Nur javamail-1.6.3-orig/demo/src/main/java/module-info.java javamail-1.6.3/demo/src/main/java/module-info.java
+--- javamail-1.6.3-orig/demo/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
++++ javamail-1.6.3/demo/src/main/java/module-info.java	2018-10-16 15:03:36.838406583 -0400
+@@ -0,0 +1,47 @@
++/*
++ * 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.demo {
++
++	exports com.sun.mail.demo;
++	exports internal;
++
++	requires javax.mail;
++}
+diff -Nur javamail-1.6.3-orig/dsn/src/main/java/module-info.java javamail-1.6.3/dsn/src/main/java/module-info.java
+--- javamail-1.6.3-orig/dsn/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
++++ javamail-1.6.3/dsn/src/main/java/module-info.java	2018-10-16 15:03:36.838406583 -0400
+@@ -0,0 +1,49 @@
++/*
++ * 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.dsn {
++
++	exports com.sun.mail.dsn;
++
++	requires com.sun.mail.android.activation;
++	requires java.datatransfer;
++	requires java.logging;
++	requires javax.mail;
++}
+diff -Nur javamail-1.6.3-orig/gimap/src/main/java/module-info.java.orig javamail-1.6.3/gimap/src/main/java/module-info.java.orig
+--- javamail-1.6.3-orig/gimap/src/main/java/module-info.java.orig	1969-12-31 19:00:00.000000000 -0500
++++ javamail-1.6.3/gimap/src/main/java/module-info.java.orig	2018-10-16 15:03:42.078377962 -0400
+@@ -0,0 +1,27 @@
++/*
++ * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
++ *
++ * This program and the accompanying materials are made available under the
++ * terms of the Eclipse Public License v. 2.0, which is available at
++ * http://www.eclipse.org/legal/epl-2.0.
++ *
++ * This Source Code may also be made available under the following Secondary
++ * Licenses when the conditions for such availability set forth in the
++ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
++ * version 2 with the GNU Classpath Exception, which is available at
++ * https://www.gnu.org/software/classpath/license.html.
++ *
++ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
++ */
++
++module com.sun.mail.gimap {
++    exports com.sun.mail.gimap;
++    exports com.sun.mail.gimap.protocol;
++    provides javax.mail.Provider with
++	com.sun.mail.gimap.GmailProvider, com.sun.mail.gimap.GmailSSLProvider;
++
++    requires java.mail;
++    requires java.logging;
++    requires java.security.sasl;
++    requires com.sun.mail.imap;
++}
+diff -Nur javamail-1.6.3-orig/gimap/src/main/java/module-info.java.rej javamail-1.6.3/gimap/src/main/java/module-info.java.rej
+--- javamail-1.6.3-orig/gimap/src/main/java/module-info.java.rej	1969-12-31 19:00:00.000000000 -0500
++++ javamail-1.6.3/gimap/src/main/java/module-info.java.rej	2018-10-16 15:03:42.078377962 -0400
+@@ -0,0 +1,51 @@
++--- gimap/src/main/java/module-info.java	2018-08-14 14:46:28.944486185 -0400
+++++ gimap/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
++@@ -1,48 +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.gimap {
++-
++-	exports com.sun.mail.gimap;
++-	exports com.sun.mail.gimap.protocol;
++-
++-	requires activation;
++-	requires javax.mail;
++-}
+diff -Nur javamail-1.6.3-orig/javadoc/src/main/java/module-info.java javamail-1.6.3/javadoc/src/main/java/module-info.java
+--- javamail-1.6.3-orig/javadoc/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
++++ javamail-1.6.3/javadoc/src/main/java/module-info.java	2018-10-16 15:03:42.079377957 -0400
+@@ -0,0 +1,44 @@
++/*
++ * 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.javadoc {
++
++	exports com.sun.mail.javadoc;
++}
+diff -Nur javamail-1.6.3-orig/logging/src/main/java/module-info.java javamail-1.6.3/logging/src/main/java/module-info.java
+--- javamail-1.6.3-orig/logging/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
++++ javamail-1.6.3/logging/src/main/java/module-info.java	2018-10-16 15:03:42.079377957 -0400
+@@ -0,0 +1,44 @@
++/*
++ * 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.logging {
++
++	exports com.sun.mail.logging;
++}
+diff -Nur javamail-1.6.3-orig/mail/src/main/java/module-info.java javamail-1.6.3/mail/src/main/java/module-info.java
+--- javamail-1.6.3-orig/mail/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
++++ javamail-1.6.3/mail/src/main/java/module-info.java	2018-10-16 15:03:42.080377951 -0400
+@@ -0,0 +1,68 @@
++/*
++ * 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 javax.mail {
++
++	exports com.sun.mail.util.logging;
++	exports com.sun.mail.util;
++	exports javax.mail.internet;
++	exports com.sun.mail.imap.protocol;
++	exports javax.mail.event;
++	exports javax.mail.util;
++	exports com.sun.mail.auth;
++	exports com.sun.mail.handlers;
++	exports com.sun.mail.pop3;
++	exports javax.mail;
++	exports oldtest.java.javax.mail.internet.socketfactory;
++	exports com.sun.mail.iap;
++	exports com.sun.mail.imap;
++	exports com.sun.mail.smtp;
++	exports javax.mail.search;
++	exports oldtest.java.javax.mail.internet;
++	exports com.sun.mail.test;
++
++	requires activation;
++	requires java.datatransfer;
++	requires java.desktop;
++	requires java.logging;
++	requires java.management;
++	requires java.security.sasl;
++	requires java.xml;
++}
+diff -Nur javamail-1.6.3-orig/mailapi/src/main/java/module-info.java.orig javamail-1.6.3/mailapi/src/main/java/module-info.java.orig
+--- javamail-1.6.3-orig/mailapi/src/main/java/module-info.java.orig	1969-12-31 19:00:00.000000000 -0500
++++ javamail-1.6.3/mailapi/src/main/java/module-info.java.orig	2018-10-16 15:03:42.080377951 -0400
+@@ -0,0 +1,33 @@
++/*
++ * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
++ *
++ * This program and the accompanying materials are made available under the
++ * terms of the Eclipse Public License v. 2.0, which is available at
++ * http://www.eclipse.org/legal/epl-2.0.
++ *
++ * This Source Code may also be made available under the following Secondary
++ * Licenses when the conditions for such availability set forth in the
++ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
++ * version 2 with the GNU Classpath Exception, which is available at
++ * https://www.gnu.org/software/classpath/license.html.
++ *
++ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
++ */
++
++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
++    uses javax.mail.Provider;
++}
+diff -Nur javamail-1.6.3-orig/mbox/src/main/java/module-info.java javamail-1.6.3/mbox/src/main/java/module-info.java
+--- javamail-1.6.3-orig/mbox/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
++++ javamail-1.6.3/mbox/src/main/java/module-info.java	2018-10-16 15:03:42.081377946 -0400
+@@ -0,0 +1,49 @@
++/*
++ * 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.mbox {
++
++	exports com.sun.mail.mbox;
++	exports com.sun.mail.remote;
++
++	requires activation;
++	requires java.datatransfer;
++	requires javax.mail;
++}
+diff -Nur javamail-1.6.3-orig/mkdir javamail-1.6.3/mkdir
+--- javamail-1.6.3-orig/mkdir	1969-12-31 19:00:00.000000000 -0500
++++ javamail-1.6.3/mkdir	2018-10-16 15:03:42.081377946 -0400
+@@ -0,0 +1,47 @@
++/*
++ * 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.android.mail {
++
++	exports com.sun.mail.android.mail;
++	exports com.sun.mail.handlers;
++
++	requires android.activation;
++}
+diff -Nur javamail-1.6.3-orig/outlook/src/main/java/module-info.java javamail-1.6.3/outlook/src/main/java/module-info.java
+--- javamail-1.6.3-orig/outlook/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
++++ javamail-1.6.3/outlook/src/main/java/module-info.java	2018-10-16 15:03:42.081377946 -0400
+@@ -0,0 +1,44 @@
++/*
++ * 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.outlook {
++
++	exports com.sun.mail.outlook;
++}
+diff -Nur javamail-1.6.3-orig/servlet/src/main/java/module-info.java javamail-1.6.3/servlet/src/main/java/module-info.java
+--- javamail-1.6.3-orig/servlet/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
++++ javamail-1.6.3/servlet/src/main/java/module-info.java	2018-10-16 15:03:42.082377940 -0400
+@@ -0,0 +1,44 @@
++/*
++ * 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.servlet {
++
++	exports com.sun.mail.servlet;
++}
+diff -Nur javamail-1.6.3-orig/src/main/java/module-info.java javamail-1.6.3/src/main/java/module-info.java
+--- javamail-1.6.3-orig/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
++++ javamail-1.6.3/src/main/java/module-info.java	2018-10-16 15:03:42.082377940 -0400
+@@ -0,0 +1,54 @@
++/*
++ * 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.all {
++
++	exports com.sun.mail.all;
++	exports com.sun.mail.mail;
++	exports com.sun.mail.mailapi;
++	exports com.sun.mail.mailapijar;
++	exports com.sun.mail.smtp;
++	exports com.sun.mail.imap;
++	exports com.sun.mail.gimap;
++	exports com.sun.mail.pop3;
++	exports com.sun.mail.dsn;
++	exports com.sun.mail.mailhandler;
++	exports com.sun.mail.android;
++}
+diff -Nur javamail-1.6.3-orig/taglib/src/main/java/module-info.java javamail-1.6.3/taglib/src/main/java/module-info.java
+--- javamail-1.6.3-orig/taglib/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
++++ javamail-1.6.3/taglib/src/main/java/module-info.java	2018-10-16 15:03:42.083377935 -0400
+@@ -0,0 +1,48 @@
++/*
++ * 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.taglib {
++
++	exports com.sun.mail.taglib;
++	exports com.sun.mail.demo;
++
++	requires javax.mail;
++	requires jsp.api;
++}
+diff -Nur javamail-1.6.3-orig/webapp/src/main/java/module-info.java javamail-1.6.3/webapp/src/main/java/module-info.java
+--- javamail-1.6.3-orig/webapp/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
++++ javamail-1.6.3/webapp/src/main/java/module-info.java	2018-10-16 15:03:42.083377935 -0400
+@@ -0,0 +1,44 @@
++/*
++ * 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.webapp {
++
++	exports com.sun.mail.webapp;
++}
diff --git a/javamail/1_dont_publish.patch b/javamail/1_dont_publish.patch
deleted file mode 100644
index 8246476..0000000
--- a/javamail/1_dont_publish.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur javamail-1.6.1-orig/pom.xml javamail-1.6.1/pom.xml
---- javamail-1.6.1-orig/pom.xml	2018-08-09 11:02:16.589430248 -0400
-+++ javamail-1.6.1/pom.xml	2018-08-09 14:35:48.661641620 -0400
-@@ -182,7 +182,6 @@
- 		<module>logging</module>
- 		<module>outlook</module>
- 		<module>javadoc</module>
--		<module>publish</module>
- 	    </modules>
- 	    <activation>
- 		<activeByDefault>true</activeByDefault>
diff --git a/javamail/2_module_info.patch b/javamail/2_module_info.patch
deleted file mode 100644
index 8b094b8..0000000
--- a/javamail/2_module_info.patch
+++ /dev/null
@@ -1,955 +0,0 @@
-diff -Nur javamail-1.6.3-orig/android/activation/src/main/java/module-info.java javamail-1.6.3/android/activation/src/main/java/module-info.java
---- javamail-1.6.3-orig/android/activation/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
-+++ javamail-1.6.3/android/activation/src/main/java/module-info.java	2018-10-16 15:03:36.837406588 -0400
-@@ -0,0 +1,49 @@
-+/*
-+ * 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.android.activation {
-+
-+    exports com.sun.mail.android.activation;
-+	exports com.sun.activation.registries;
-+	exports javax.activation;
-+
-+	requires java.desktop;
-+	requires java.logging;
-+}
-diff -Nur javamail-1.6.3-orig/android/mail/src/main/java/module-info.java javamail-1.6.3/android/mail/src/main/java/module-info.java
---- javamail-1.6.3-orig/android/mail/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
-+++ javamail-1.6.3/android/mail/src/main/java/module-info.java	2018-10-16 15:03:36.838406583 -0400
-@@ -0,0 +1,47 @@
-+/*
-+ * 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.android.mail {
-+
-+	exports com.sun.mail.android.mail;
-+	exports com.sun.mail.handlers;
-+
-+	requires android.activation;
-+}
-diff -Nur javamail-1.6.3-orig/android/src/main/java/module-info.java javamail-1.6.3/android/src/main/java/module-info.java
---- javamail-1.6.3-orig/android/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
-+++ javamail-1.6.3/android/src/main/java/module-info.java	2018-10-16 15:03:36.838406583 -0400
-@@ -0,0 +1,46 @@
-+/*
-+ * 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.android {
-+
-+	exports com.sun.mail.android;
-+	exports com.sun.mail.android.activation;
-+	exports com.sun.mail.android.mail;
-+}
-diff -Nur javamail-1.6.3-orig/client/src/main/java/module-info.java javamail-1.6.3/client/src/main/java/module-info.java
---- javamail-1.6.3-orig/client/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
-+++ javamail-1.6.3/client/src/main/java/module-info.java	2018-10-16 15:03:36.838406583 -0400
-@@ -0,0 +1,44 @@
-+/*
-+ * 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.client {
-+
-+	exports com.sun.mail.client;
-+}
-diff -Nur javamail-1.6.3-orig/demo/src/main/java/module-info.java javamail-1.6.3/demo/src/main/java/module-info.java
---- javamail-1.6.3-orig/demo/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
-+++ javamail-1.6.3/demo/src/main/java/module-info.java	2018-10-16 15:03:36.838406583 -0400
-@@ -0,0 +1,47 @@
-+/*
-+ * 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.demo {
-+
-+	exports com.sun.mail.demo;
-+	exports internal;
-+
-+	requires javax.mail;
-+}
-diff -Nur javamail-1.6.3-orig/dsn/src/main/java/module-info.java javamail-1.6.3/dsn/src/main/java/module-info.java
---- javamail-1.6.3-orig/dsn/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
-+++ javamail-1.6.3/dsn/src/main/java/module-info.java	2018-10-16 15:03:36.838406583 -0400
-@@ -0,0 +1,49 @@
-+/*
-+ * 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.dsn {
-+
-+	exports com.sun.mail.dsn;
-+
-+	requires com.sun.mail.android.activation;
-+	requires java.datatransfer;
-+	requires java.logging;
-+	requires javax.mail;
-+}
-diff -Nur javamail-1.6.3-orig/gimap/src/main/java/module-info.java.orig javamail-1.6.3/gimap/src/main/java/module-info.java.orig
---- javamail-1.6.3-orig/gimap/src/main/java/module-info.java.orig	1969-12-31 19:00:00.000000000 -0500
-+++ javamail-1.6.3/gimap/src/main/java/module-info.java.orig	2018-10-16 15:03:42.078377962 -0400
-@@ -0,0 +1,27 @@
-+/*
-+ * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-+ *
-+ * This program and the accompanying materials are made available under the
-+ * terms of the Eclipse Public License v. 2.0, which is available at
-+ * http://www.eclipse.org/legal/epl-2.0.
-+ *
-+ * This Source Code may also be made available under the following Secondary
-+ * Licenses when the conditions for such availability set forth in the
-+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-+ * version 2 with the GNU Classpath Exception, which is available at
-+ * https://www.gnu.org/software/classpath/license.html.
-+ *
-+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-+ */
-+
-+module com.sun.mail.gimap {
-+    exports com.sun.mail.gimap;
-+    exports com.sun.mail.gimap.protocol;
-+    provides javax.mail.Provider with
-+	com.sun.mail.gimap.GmailProvider, com.sun.mail.gimap.GmailSSLProvider;
-+
-+    requires java.mail;
-+    requires java.logging;
-+    requires java.security.sasl;
-+    requires com.sun.mail.imap;
-+}
-diff -Nur javamail-1.6.3-orig/gimap/src/main/java/module-info.java.rej javamail-1.6.3/gimap/src/main/java/module-info.java.rej
---- javamail-1.6.3-orig/gimap/src/main/java/module-info.java.rej	1969-12-31 19:00:00.000000000 -0500
-+++ javamail-1.6.3/gimap/src/main/java/module-info.java.rej	2018-10-16 15:03:42.078377962 -0400
-@@ -0,0 +1,51 @@
-+--- gimap/src/main/java/module-info.java	2018-08-14 14:46:28.944486185 -0400
-++++ gimap/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
-+@@ -1,48 +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.gimap {
-+-
-+-	exports com.sun.mail.gimap;
-+-	exports com.sun.mail.gimap.protocol;
-+-
-+-	requires activation;
-+-	requires javax.mail;
-+-}
-diff -Nur javamail-1.6.3-orig/javadoc/src/main/java/module-info.java javamail-1.6.3/javadoc/src/main/java/module-info.java
---- javamail-1.6.3-orig/javadoc/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
-+++ javamail-1.6.3/javadoc/src/main/java/module-info.java	2018-10-16 15:03:42.079377957 -0400
-@@ -0,0 +1,44 @@
-+/*
-+ * 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.javadoc {
-+
-+	exports com.sun.mail.javadoc;
-+}
-diff -Nur javamail-1.6.3-orig/logging/src/main/java/module-info.java javamail-1.6.3/logging/src/main/java/module-info.java
---- javamail-1.6.3-orig/logging/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
-+++ javamail-1.6.3/logging/src/main/java/module-info.java	2018-10-16 15:03:42.079377957 -0400
-@@ -0,0 +1,44 @@
-+/*
-+ * 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.logging {
-+
-+	exports com.sun.mail.logging;
-+}
-diff -Nur javamail-1.6.3-orig/mail/src/main/java/module-info.java javamail-1.6.3/mail/src/main/java/module-info.java
---- javamail-1.6.3-orig/mail/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
-+++ javamail-1.6.3/mail/src/main/java/module-info.java	2018-10-16 15:03:42.080377951 -0400
-@@ -0,0 +1,68 @@
-+/*
-+ * 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 javax.mail {
-+
-+	exports com.sun.mail.util.logging;
-+	exports com.sun.mail.util;
-+	exports javax.mail.internet;
-+	exports com.sun.mail.imap.protocol;
-+	exports javax.mail.event;
-+	exports javax.mail.util;
-+	exports com.sun.mail.auth;
-+	exports com.sun.mail.handlers;
-+	exports com.sun.mail.pop3;
-+	exports javax.mail;
-+	exports oldtest.java.javax.mail.internet.socketfactory;
-+	exports com.sun.mail.iap;
-+	exports com.sun.mail.imap;
-+	exports com.sun.mail.smtp;
-+	exports javax.mail.search;
-+	exports oldtest.java.javax.mail.internet;
-+	exports com.sun.mail.test;
-+
-+	requires activation;
-+	requires java.datatransfer;
-+	requires java.desktop;
-+	requires java.logging;
-+	requires java.management;
-+	requires java.security.sasl;
-+	requires java.xml;
-+}
-diff -Nur javamail-1.6.3-orig/mailapi/src/main/java/module-info.java.orig javamail-1.6.3/mailapi/src/main/java/module-info.java.orig
---- javamail-1.6.3-orig/mailapi/src/main/java/module-info.java.orig	1969-12-31 19:00:00.000000000 -0500
-+++ javamail-1.6.3/mailapi/src/main/java/module-info.java.orig	2018-10-16 15:03:42.080377951 -0400
-@@ -0,0 +1,33 @@
-+/*
-+ * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-+ *
-+ * This program and the accompanying materials are made available under the
-+ * terms of the Eclipse Public License v. 2.0, which is available at
-+ * http://www.eclipse.org/legal/epl-2.0.
-+ *
-+ * This Source Code may also be made available under the following Secondary
-+ * Licenses when the conditions for such availability set forth in the
-+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-+ * version 2 with the GNU Classpath Exception, which is available at
-+ * https://www.gnu.org/software/classpath/license.html.
-+ *
-+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-+ */
-+
-+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
-+    uses javax.mail.Provider;
-+}
-diff -Nur javamail-1.6.3-orig/mbox/src/main/java/module-info.java javamail-1.6.3/mbox/src/main/java/module-info.java
---- javamail-1.6.3-orig/mbox/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
-+++ javamail-1.6.3/mbox/src/main/java/module-info.java	2018-10-16 15:03:42.081377946 -0400
-@@ -0,0 +1,49 @@
-+/*
-+ * 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.mbox {
-+
-+	exports com.sun.mail.mbox;
-+	exports com.sun.mail.remote;
-+
-+	requires activation;
-+	requires java.datatransfer;
-+	requires javax.mail;
-+}
-diff -Nur javamail-1.6.3-orig/mkdir javamail-1.6.3/mkdir
---- javamail-1.6.3-orig/mkdir	1969-12-31 19:00:00.000000000 -0500
-+++ javamail-1.6.3/mkdir	2018-10-16 15:03:42.081377946 -0400
-@@ -0,0 +1,47 @@
-+/*
-+ * 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.android.mail {
-+
-+	exports com.sun.mail.android.mail;
-+	exports com.sun.mail.handlers;
-+
-+	requires android.activation;
-+}
-diff -Nur javamail-1.6.3-orig/outlook/src/main/java/module-info.java javamail-1.6.3/outlook/src/main/java/module-info.java
---- javamail-1.6.3-orig/outlook/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
-+++ javamail-1.6.3/outlook/src/main/java/module-info.java	2018-10-16 15:03:42.081377946 -0400
-@@ -0,0 +1,44 @@
-+/*
-+ * 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.outlook {
-+
-+	exports com.sun.mail.outlook;
-+}
-diff -Nur javamail-1.6.3-orig/servlet/src/main/java/module-info.java javamail-1.6.3/servlet/src/main/java/module-info.java
---- javamail-1.6.3-orig/servlet/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
-+++ javamail-1.6.3/servlet/src/main/java/module-info.java	2018-10-16 15:03:42.082377940 -0400
-@@ -0,0 +1,44 @@
-+/*
-+ * 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.servlet {
-+
-+	exports com.sun.mail.servlet;
-+}
-diff -Nur javamail-1.6.3-orig/src/main/java/module-info.java javamail-1.6.3/src/main/java/module-info.java
---- javamail-1.6.3-orig/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
-+++ javamail-1.6.3/src/main/java/module-info.java	2018-10-16 15:03:42.082377940 -0400
-@@ -0,0 +1,54 @@
-+/*
-+ * 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.all {
-+
-+	exports com.sun.mail.all;
-+	exports com.sun.mail.mail;
-+	exports com.sun.mail.mailapi;
-+	exports com.sun.mail.mailapijar;
-+	exports com.sun.mail.smtp;
-+	exports com.sun.mail.imap;
-+	exports com.sun.mail.gimap;
-+	exports com.sun.mail.pop3;
-+	exports com.sun.mail.dsn;
-+	exports com.sun.mail.mailhandler;
-+	exports com.sun.mail.android;
-+}
-diff -Nur javamail-1.6.3-orig/taglib/src/main/java/module-info.java javamail-1.6.3/taglib/src/main/java/module-info.java
---- javamail-1.6.3-orig/taglib/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
-+++ javamail-1.6.3/taglib/src/main/java/module-info.java	2018-10-16 15:03:42.083377935 -0400
-@@ -0,0 +1,48 @@
-+/*
-+ * 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.taglib {
-+
-+	exports com.sun.mail.taglib;
-+	exports com.sun.mail.demo;
-+
-+	requires javax.mail;
-+	requires jsp.api;
-+}
-diff -Nur javamail-1.6.3-orig/webapp/src/main/java/module-info.java javamail-1.6.3/webapp/src/main/java/module-info.java
---- javamail-1.6.3-orig/webapp/src/main/java/module-info.java	1969-12-31 19:00:00.000000000 -0500
-+++ javamail-1.6.3/webapp/src/main/java/module-info.java	2018-10-16 15:03:42.083377935 -0400
-@@ -0,0 +1,44 @@
-+/*
-+ * 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.webapp {
-+
-+	exports com.sun.mail.webapp;
-+}
diff --git a/javamail/3_remove_javadoc_aggregate.patch b/javamail/3_remove_javadoc_aggregate.patch
deleted file mode 100644
index 179e69a..0000000
--- a/javamail/3_remove_javadoc_aggregate.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -Nur javamail-1.6.1-orig/pom.xml javamail-1.6.1/pom.xml
---- javamail-1.6.1-orig/pom.xml	2018-08-09 11:02:16.589430248 -0400
-+++ javamail-1.6.1/pom.xml	2018-08-15 12:15:32.888635854 -0400
-@@ -215,19 +215,6 @@
- 
- 		    <plugin>
- 			<groupId>org.apache.maven.plugins</groupId>
--			<artifactId>maven-javadoc-plugin</artifactId>
--			<executions>
--			    <execution>
--				<id>attach-javadocs</id>
--				<goals>
--				    <goal>jar</goal>
--				</goals>
--			    </execution>
--			</executions>
--		    </plugin>
--
--		    <plugin>
--			<groupId>org.apache.maven.plugins</groupId>
- 			<artifactId>maven-gpg-plugin</artifactId>
- 			<version>1.1</version>
- 			<executions>
-@@ -263,19 +250,6 @@
- 			    <skip>true</skip>
- 			</configuration>
- 		    </plugin>
--
--		    <plugin>
--			<groupId>org.apache.maven.plugins</groupId>
--			<artifactId>maven-javadoc-plugin</artifactId>
--			<executions>
--			    <execution>
--				<id>attach-javadocs</id>
--				<goals>
--				    <goal>jar</goal>
--				</goals>
--			    </execution>
--			</executions>
--		    </plugin>
- 		</plugins>
- 	    </build>
- 	</profile>
-@@ -717,31 +691,6 @@
- 		</plugin>
- 		<plugin>
- 		    <groupId>org.apache.maven.plugins</groupId>
--		    <artifactId>maven-javadoc-plugin</artifactId>
--		    <version>3.0.0-M1</version>
--		    <configuration>
--			<!-- make all the APIs available for javadoc -->
--			<additionalDependencies>
--			    <additionalDependency>
--				<groupId>com.sun.mail</groupId>
--				<artifactId>javax.mail</artifactId>
--				<version>${mail.version}</version>
--			    </additionalDependency>
--			    <additionalDependency>
--				<groupId>com.sun.mail</groupId>
--				<artifactId>gimap</artifactId>
--				<version>${mail.version}</version>
--			    </additionalDependency>
--			</additionalDependencies>
--			<sourceFileExcludes>
--			    <sourceFileExclude>
--				module-info.java
--			    </sourceFileExclude>
--			</sourceFileExcludes>
--		    </configuration>
--		</plugin>
--		<plugin>
--		    <groupId>org.apache.maven.plugins</groupId>
- 		    <artifactId>maven-war-plugin</artifactId>
- 		    <version>2.2</version>
- 		</plugin>
diff --git a/javamail/4_jar_for_webapp.patch b/javamail/4_jar_for_webapp.patch
deleted file mode 100644
index e62fa04..0000000
--- a/javamail/4_jar_for_webapp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur javamail-1.6.1-orig/webapp/pom.xml javamail-1.6.1/webapp/pom.xml
---- javamail-1.6.1-orig/webapp/pom.xml	2018-08-09 11:02:16.593430231 -0400
-+++ javamail-1.6.1/webapp/pom.xml	2018-08-21 11:40:40.259479166 -0400
-@@ -53,7 +53,7 @@
-     <modelVersion>4.0.0</modelVersion>
-     <groupId>com.sun.mail</groupId>
-     <artifactId>webapp</artifactId>
--    <packaging>war</packaging>
-+    <packaging>jar</packaging>
-     <name>JavaMail API demo webapp</name>
- 
-     <build>
diff --git a/javamail/5_servlet_module.patch b/javamail/5_servlet_module.patch
deleted file mode 100644
index 237e236..0000000
--- a/javamail/5_servlet_module.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur javamail-1.6.1-orig/pom.xml javamail-1.6.1/pom.xml
---- javamail-1.6.1-orig/pom.xml	2018-09-18 08:37:07.102441253 -0400
-+++ javamail-1.6.1/pom.xml	2018-09-18 08:37:41.380270534 -0400
-@@ -163,6 +163,7 @@
- 	<module>dsn</module>
- 	<module>mailhandler</module>
- 	<module>android</module>
-+        <module>servlet</module>
-     </modules>
- 
-     <profiles>
diff --git a/javamail/javamail.spec b/javamail/javamail.spec
index b2471e2..0b537f5 100644
--- a/javamail/javamail.spec
+++ b/javamail/javamail.spec
@@ -16,79 +16,52 @@ BuildArch:      noarch
 #   rm -r javamail-1.6.3/
 Source:        javamail-1.6.3.tar.gz
 
-# these tests need to be re-written for jdk >=1.8
-Patch0:   0_ignore_broken_tests.patch
+Patch0:   0_module_info.patch
 
-# no need to publish release build
-Patch1:   1_dont_publish.patch
-
-# add missing module-info.java files
-Patch2:   2_module_info.patch
-
-# javadoc:aggregate causing build issues, see https://issues.apache.org/jira/browse/MJAVADOC-449
-Patch3:   3_remove_javadoc_aggregate.patch
-
-# webapp creates WAR which cannot be installed (org.fedoraproject.xmvn.tools.install.ArtifactInstallationException)
-# create JAR instread of WAR
-Patch4:   4_jar_for_webapp.patch
-
-# add servlet module to build
-Patch5:   5_servlet_module.patch
-
-BuildRequires:  ee4j
-BuildRequires:  jboss-jsp-2.2-api
-BuildRequires:  glassfish-hk2-maven-plugins
-BuildRequires:  glassfish-servlet-api
-BuildRequires:  maven-dependency-plugin
-BuildRequires:  maven-enforcer-plugin
-BuildRequires:  maven-javadoc-plugin
 BuildRequires:  maven-local
-BuildRequires:  maven-plugin-build-helper
-BuildRequires:  maven-plugin-bundle
-BuildRequires:  maven-source-plugin
-
-Requires: java-openjdk
+BuildRequires:  mvn(org.apache.maven.plugins:maven-dependency-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
+BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
+BuildRequires:  mvn(org.eclipse.ee4j:project:pom:)
+BuildRequires:  mvn(org.glassfish.hk2:osgiversion-maven-plugin)
+BuildRequires:  mvn(javax.servlet.jsp:jsp-api)
+BuildRequires:  osgi(javax.servlet-api)
 
 # Adapted from the classpathx-mail (and JPackage glassfish-javamail) Provides.
 Provides:       javamail-monolithic = %{version}-%{release}
 
 Provides:       javax.mail
 
-Provides: osgi(javax.mail.dsn) = %{version}
-Provides: osgi(javax.mail.gimap) = %{version}
-Provides: osgi(javax.mail.imap) = %{version}
-Provides: osgi(javax.mail.pop3) = %{version}
-Provides: osgi(javax.mail.smtp) = %{version}
-
 %description
 The JavaMail API provides a platform-independent and protocol-independent
 framework to build mail and messaging applications. The JavaMail API is
 available as an optional package for use with the Java SE platform
 and is also included in the Java EE platform.
 
-
 %package javadoc
 Summary:        Javadoc for %{name}
 
 %description javadoc
 %{summary}.
 
-
 %prep
 %setup -q
 
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%pom_disable_module javadoc
-%patch4 -p1
-%patch5 -p1
 
 %pom_disable_module android
+%pom_disable_module javadoc
 
 %pom_remove_dep javax.activation:activation mail
 
+%pom_remove_plugin :maven-javadoc-plugin
+
+%pom_xpath_set "pom:packaging" "jar" webapp/pom.xml
+
+%pom_xpath_inject "pom:modules" "<module>servlet</module>"
+
 # Alternative names for super JAR containing API and implementation.
 %mvn_alias com.sun.mail:mailapi javax.mail:mailapi
 %mvn_alias com.sun.mail:javax.mail javax.mail:mail \
@@ -98,7 +71,9 @@ Summary:        Javadoc for %{name}
 %build
 
 # skip javadoc generation
-%mvn_build -j
+# ignore test failures
+# use 'deploy-snapshot' profile
+%mvn_build -j -- -Dmaven.test.failure.ignore=true -P deploy-snapshot
 
 %install
 %mvn_install
@@ -106,14 +81,10 @@ Summary:        Javadoc for %{name}
 install -d -m 755 %{buildroot}%{_javadir}/javax.mail/
 ln -sf ../%{name}/javax.mail.jar %{buildroot}%{_javadir}/javax.mail/
 
-%files
-%license LICENSE.md
+%files -f .mfiles
 %doc README.md
-/usr/lib/java/%{name}
-%{_javadir}/%{name}
+%license LICENSE.md
 %{_javadir}/javax.mail/
-%{_datadir}/maven-poms/%{name}
-%{_datadir}/maven-metadata/%{name}.xml
 
 %changelog
 * Tue Oct 16 2018 Salman Siddiqui <sasiddiq@redhat.com> - 1.6.3-1

From 7588f7d54c716b3a6803e9e7e6d12ff1bc03e71d Mon Sep 17 00:00:00 2001
From: Salman Siddiqui <sasiddiq@localhost.localdomain>
Date: Nov 16 2018 16:08:05 +0000
Subject: [PATCH 8/15] remove %global debug_package %{nil} from noarch packages


---

diff --git a/dd-plist/dd-plist.spec b/dd-plist/dd-plist.spec
index fd5996e..b71c140 100644
--- a/dd-plist/dd-plist.spec
+++ b/dd-plist/dd-plist.spec
@@ -28,8 +28,6 @@ Summary:  Javadoc for %{name}
 %description javadoc
 %{summary}.
 
-%global debug_package %{nil}
-
 %prep
 %autosetup -n dd-plist-dd-plist-1.21
 
diff --git a/directory-maven-plugin/directory-maven-plugin.spec b/directory-maven-plugin/directory-maven-plugin.spec
index e4cbd30..ab626aa 100644
--- a/directory-maven-plugin/directory-maven-plugin.spec
+++ b/directory-maven-plugin/directory-maven-plugin.spec
@@ -34,8 +34,6 @@ Summary:  Javadoc for %{name}
 %description javadoc
 %{summary}.
 
-%global debug_package %{nil}
-
 %prep
 %autosetup -n directory-maven-plugin-directory-maven-plugin-0.3.1
 
diff --git a/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec b/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec
index ec5e449..3ceb4b2 100644
--- a/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec
+++ b/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec
@@ -25,8 +25,6 @@ product build. This Maven plugin manipulates the Info.plist between the
 materialize-products and archive-products goals of the P2 Directory Tycho
 plugin to provide a custom Info.plist file for Eclipse RCP product.
 
-%global debug_package %{nil}
-
 %prep
 %setup -q -n fix-info-plist-maven-plugin-1.2
 
diff --git a/jmc-core/jmc-core.spec b/jmc-core/jmc-core.spec
index 59aecf6..e6a686c 100644
--- a/jmc-core/jmc-core.spec
+++ b/jmc-core/jmc-core.spec
@@ -22,8 +22,6 @@ detailed analysis of the extensive data collected by Java Flight Recorder.
 The tool chain enables developers and administrators to collect and analyze data 
 from Java applications running locally or deployed in production environments.
 
-%global debug_package %{nil}
-
 %prep
 %setup -q
 

From c43dc5a380214c9d2937cd35fe9563067d0fff60 Mon Sep 17 00:00:00 2001
From: Salman Siddiqui <sasiddiq@localhost.localdomain>
Date: Nov 16 2018 16:50:54 +0000
Subject: [PATCH 9/15] use mvn()-style BRs and add javadoc subpackage for jaf


---

diff --git a/jaf/jaf.spec b/jaf/jaf.spec
index 2ae9e79..baaea7a 100644
--- a/jaf/jaf.spec
+++ b/jaf/jaf.spec
@@ -14,16 +14,14 @@ Patch0:		0_add_manifest.patch
 
 BuildArch:	noarch
 
-BuildRequires:	ee4j
-BuildRequires:	glassfish-hk2-maven-plugins
-BuildRequires:	maven-dependency-plugin
-BuildRequires:	maven-enforcer-plugin
 BuildRequires:	maven-local
-BuildRequires:	maven-plugin-build-helper
-BuildRequires:	maven-plugin-bundle
-BuildRequires:	maven-source-plugin
-
-Requires:	java-openjdk
+BuildRequires:	mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:	mvn(org.apache.maven.plugins:maven-dependency-plugin)
+BuildRequires:	mvn(org.apache.maven.plugins:maven-enforcer-plugin)
+BuildRequires:	mvn(org.apache.maven.plugins:maven-source-plugin)
+BuildRequires:	mvn(org.codehaus.mojo:build-helper-maven-plugin)
+BuildRequires:  mvn(org.eclipse.ee4j:project:pom:)
+BuildRequires:  mvn(org.glassfish.hk2:osgiversion-maven-plugin)
 
 %description
 The JavaBeans Activation Framework (JAF) is a standard extension to the
@@ -32,13 +30,18 @@ determine the type of an arbitrary piece of data; encapsulate access to it;
 discover the operations available on it; and instantiate the appropriate
 bean to perform the operation(s).
 
+%package javadoc
+Summary:        Javadoc for %{name}
+
+%description javadoc
+%{summary}.
+
 %prep
 %setup -q -n %{tarball_name}
 %patch0 -p1
 
 %pom_disable_module demo
 
-
 mkdir -p %{_builddir}/%{tarball_name}/activationapi/target/sources/
 cp -r %{_builddir}/%{tarball_name}/activation/src/main/java/javax/ %{_builddir}/%{tarball_name}/activationapi/target/sources/
 cp -r %{_builddir}/%{tarball_name}/activation/src/main/java/com/ %{_builddir}/%{tarball_name}/activationapi/target/sources/
@@ -55,14 +58,15 @@ cp -r %{_builddir}/%{tarball_name}/activationapi/META-INF %{_builddir}/%{tarball
 %install
 %mvn_install
 
-%files
+%files -f .mfiles
+%license LICENSE.md
+%license NOTICE.md
+%doc README.md
+
+%files javadoc -f .mfiles-javadoc
 %license LICENSE.md
 %license NOTICE.md
 %doc README.md
-%{_javadir}/%{name}
-%{_javadocdir}/%{name}
-%{_datadir}/maven-poms/%{name}
-%{_datadir}/maven-metadata/%{name}.xml
 
 %changelog
 * Fri Sep 21 2018 Salman Siddiqui <sasiddiq@redhat.com> - 1.2.1-1

From defc779b6b848fe77194b5c08d0358003ce0aa68 Mon Sep 17 00:00:00 2001
From: Salman Siddiqui <sasiddiq@localhost.localdomain>
Date: Nov 16 2018 16:56:22 +0000
Subject: [PATCH 10/15] use correct license (BSD) for jaf


---

diff --git a/jaf/jaf.spec b/jaf/jaf.spec
index baaea7a..7158d52 100644
--- a/jaf/jaf.spec
+++ b/jaf/jaf.spec
@@ -5,7 +5,7 @@ Version:	1.2.1
 Release:	1%{?dist}
 Summary:	JavaBeans Activation Framework
 
-License:	CDDL-1.1
+License:	BSD
 URL:		https://github.com/eclipse-ee4j/jaf
 
 Source0:	https://github.com/eclipse-ee4j/jaf/archive/initial-contribution.tar.gz

From 844d8e359c1ad83fb5df8e00317d7cf290710b5f Mon Sep 17 00:00:00 2001
From: Salman Siddiqui <sasiddiq@localhost.localdomain>
Date: Nov 16 2018 17:27:49 +0000
Subject: [PATCH 11/15] owasp-java-encoder: correct license and remove unnecessary files from patch


---

diff --git a/jaf/jaf.spec b/jaf/jaf.spec
index 7158d52..7144f73 100644
--- a/jaf/jaf.spec
+++ b/jaf/jaf.spec
@@ -20,8 +20,8 @@ BuildRequires:	mvn(org.apache.maven.plugins:maven-dependency-plugin)
 BuildRequires:	mvn(org.apache.maven.plugins:maven-enforcer-plugin)
 BuildRequires:	mvn(org.apache.maven.plugins:maven-source-plugin)
 BuildRequires:	mvn(org.codehaus.mojo:build-helper-maven-plugin)
-BuildRequires:  mvn(org.eclipse.ee4j:project:pom:)
-BuildRequires:  mvn(org.glassfish.hk2:osgiversion-maven-plugin)
+BuildRequires:	mvn(org.eclipse.ee4j:project:pom:)
+BuildRequires:	mvn(org.glassfish.hk2:osgiversion-maven-plugin)
 
 %description
 The JavaBeans Activation Framework (JAF) is a standard extension to the
@@ -31,7 +31,7 @@ discover the operations available on it; and instantiate the appropriate
 bean to perform the operation(s).
 
 %package javadoc
-Summary:        Javadoc for %{name}
+Summary:	Javadoc for %{name}
 
 %description javadoc
 %{summary}.
diff --git a/owasp-java-encoder/0_manifest.patch b/owasp-java-encoder/0_manifest.patch
index 5d00b69..566c126 100644
--- a/owasp-java-encoder/0_manifest.patch
+++ b/owasp-java-encoder/0_manifest.patch
@@ -11,126 +11,3 @@ diff -Nur owasp-java-encoder-1.2.1-orig/META-INF/MANIFEST.MF owasp-java-encoder-
 +Created-By: 1.8.0_181 (Oracle Corporation)
 +Export-Package: org.owasp.encoder
 +Tool: Bnd-1.50.0
-diff -Nur owasp-java-encoder-1.2.1-orig/META-INF/maven/org.owasp.encoder/encoder/pom.properties owasp-java-encoder-1.2.1/META-INF/maven/org.owasp.encoder/encoder/pom.properties
---- owasp-java-encoder-1.2.1-orig/META-INF/maven/org.owasp.encoder/encoder/pom.properties	1969-12-31 19:00:00.000000000 -0500
-+++ owasp-java-encoder-1.2.1/META-INF/maven/org.owasp.encoder/encoder/pom.properties	2018-08-07 11:59:15.924471357 -0400
-@@ -0,0 +1,4 @@
-+#Created by Apache Maven 3.5.2
-+version=1.2.1
-+groupId=org.owasp.encoder
-+artifactId=encoder
-diff -Nur owasp-java-encoder-1.2.1-orig/META-INF/maven/org.owasp.encoder/encoder/pom.xml owasp-java-encoder-1.2.1/META-INF/maven/org.owasp.encoder/encoder/pom.xml
---- owasp-java-encoder-1.2.1-orig/META-INF/maven/org.owasp.encoder/encoder/pom.xml	1969-12-31 19:00:00.000000000 -0500
-+++ owasp-java-encoder-1.2.1/META-INF/maven/org.owasp.encoder/encoder/pom.xml	2018-08-07 11:59:15.924471357 -0400
-@@ -0,0 +1,99 @@
-+<?xml version="1.0" encoding="US-ASCII"?>
-+<!--
-+~ Copyright (c) 2015 OWASP.
-+~ All rights reserved.
-+~
-+~ Redistribution and use in source and binary forms, with or without
-+~ modification, are permitted provided that the following conditions
-+~ are met:
-+~
-+~     * Redistributions of source code must retain the above
-+~       copyright notice, this list of conditions and the following
-+~       disclaimer.
-+~
-+~     * Redistributions in binary form must reproduce the above
-+~       copyright notice, this list of conditions and the following
-+~       disclaimer in the documentation and/or other materials
-+~       provided with the distribution.
-+~
-+~     * Neither the name of the OWASP nor the names of its
-+~       contributors may be used to endorse or promote products
-+~       derived from this software without specific prior written
-+~       permission.
-+~
-+~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+~ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+~ COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-+~ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+~ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+~ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+~ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-+~ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+~ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-+~ OF THE POSSIBILITY OF SUCH DAMAGE.
-+-->
-+
-+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-+    <modelVersion>4.0.0</modelVersion>
-+
-+    <parent>
-+        <groupId>org.owasp.encoder</groupId>
-+        <artifactId>encoder-parent</artifactId>
-+        <version>1.2.1</version>
-+    </parent>
-+
-+    <artifactId>encoder</artifactId>
-+    <packaging>jar</packaging>
-+
-+    <name>Java Encoder</name>
-+    <description>
-+        The OWASP Encoders package is a collection of high-performance low-overhead
-+        contextual encoders, that when utilized correctly, is an effective tool in
-+        preventing Web Application security vulnerabilities such as Cross-Site
-+        Scripting.
-+    </description>
-+
-+    <build>
-+        <plugins>
-+            <plugin>
-+                <groupId>org.apache.maven.plugins</groupId>
-+                <artifactId>maven-surefire-plugin</artifactId>
-+                <configuration>
-+                    <excludes>
-+                        <exclude>org/owasp/encoder/BenchmarkTest.java</exclude>
-+                    </excludes>
-+                </configuration>
-+            </plugin>
-+        </plugins>
-+    </build>
-+    <profiles>
-+        <profile>
-+            <id>benchmark</id>
-+            <build>
-+                <plugins>
-+                    <plugin>
-+                        <groupId>org.apache.maven.plugins</groupId>
-+                        <artifactId>maven-failsafe-plugin</artifactId>
-+                        <configuration>
-+                            <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
-+                            <includes>
-+                                <include>org/owasp/encoder/BenchmarkTest.java</include>
-+                            </includes>
-+                        </configuration>
-+                        <executions>
-+                            <execution>
-+                                <goals>
-+                                    <goal>integration-test</goal>
-+                                    <goal>verify</goal>
-+                                </goals>
-+                            </execution>
-+                        </executions>
-+                    </plugin>
-+                </plugins>
-+            </build>
-+        </profile>
-+    </profiles>
-+</project>
-diff -Nur owasp-java-encoder-1.2.1-orig/pom.xml owasp-java-encoder-1.2.1/pom.xml
---- owasp-java-encoder-1.2.1-orig/pom.xml	2017-02-19 07:20:04.000000000 -0500
-+++ owasp-java-encoder-1.2.1/pom.xml	2018-08-07 11:59:37.190375923 -0400
-@@ -54,8 +54,6 @@
- 
-     <modules>
-         <module>core</module>
--        <module>jsp</module>
--        <module>esapi</module>
-     </modules>
- 
-     <url>https://www.owasp.org/index.php/OWASP_Java_Encoder_Project</url>
diff --git a/owasp-java-encoder/owasp-java-encoder.spec b/owasp-java-encoder/owasp-java-encoder.spec
index 13eceab..52bcaf3 100644
--- a/owasp-java-encoder/owasp-java-encoder.spec
+++ b/owasp-java-encoder/owasp-java-encoder.spec
@@ -3,7 +3,7 @@ Version:	1.2.1
 Release:	1%{?dist}
 Summary:	Collection of high-performance low-overhead contextual encoders
 
-License:	ASL 2.0
+License:	BSD
 URL:		https://github.com/OWASP/owasp-java-encoder/
 
 Source0:	https://github.com/OWASP/owasp-java-encoder/archive/v1.2.1.tar.gz
@@ -15,7 +15,7 @@ BuildArch:	noarch
 
 BuildRequires:	maven-local
 BuildRequires:	mvn(org.apache.maven.plugins:maven-source-plugin)
-BuildRequires:  mvn(org.sonatype.oss:oss-parent:pom:)
+BuildRequires:	mvn(org.sonatype.oss:oss-parent:pom:)
 
 %description
 The OWASP Encoders package is a collection of high-performance low-overhead
@@ -34,6 +34,10 @@ Summary:  Javadoc for %{name}
 
 %patch0 -p1
 
+%pom_disable_module jsp
+%pom_disable_module esapi
+
+
 # analysis tool for testing coverage is not required
 %pom_remove_plugin :cobertura-maven-plugin
 

From 69b2acecc8d278a968b3effa8af295e8a96f68a4 Mon Sep 17 00:00:00 2001
From: Salman Siddiqui <sasiddiq@redhat.com>
Date: Nov 16 2018 18:11:39 +0000
Subject: [PATCH 12/15] jmc-core: add javadoc subpackage and license and doc files


---

diff --git a/jmc-core/generate_jmc_core_tarball.sh b/jmc-core/generate_jmc_core_tarball.sh
index 6dc7472..b9f9232 100755
--- a/jmc-core/generate_jmc_core_tarball.sh
+++ b/jmc-core/generate_jmc_core_tarball.sh
@@ -4,5 +4,7 @@ wget http://hg.openjdk.java.net/jmc/jmc/archive/ecb68ef82eb7.tar.gz
 tar xzf ecb68ef82eb7.tar.gz
 rm ecb68ef82eb7.tar.gz
 cp -r jmc-ecb68ef82eb7/core/ jmc-core-7.0.0/
+cp jmc-ecb68ef82eb7/license/* jmc-core-7.0.0/
+cp jmc-ecb68ef82eb7/README.md jmc-core-7.0.0/
 tar czf jmc-core-7.0.0.tar.gz jmc-core-7.0.0/
 rm -r jmc-core-7.0.0/ jmc-ecb68ef82eb7
\ No newline at end of file
diff --git a/jmc-core/jmc-core.spec b/jmc-core/jmc-core.spec
index e6a686c..c1268a0 100644
--- a/jmc-core/jmc-core.spec
+++ b/jmc-core/jmc-core.spec
@@ -1,7 +1,7 @@
 Name:		jmc-core
 Version:	7.0.0
 Release:	1%{?dist}
-Summary:	Java Mission Control is a profiling and diagnostics tool
+Summary:	Core API for Java Mission Control
 
 License:	UPL
 URL:		http://openjdk.java.net/projects/jmc/
@@ -12,9 +12,7 @@ Source0:	jmc-core-7.0.0.tar.gz
 BuildArch:  noarch
 
 BuildRequires:	maven-local
-BuildRequires:	owasp-java-encoder
-
-Requires:	java-openjdk
+BuildRequires:	mvn(org.owasp.encoder:encoder)
 
 %description
 Java Mission Control is an advanced set of tools that enables efficient and 
@@ -22,6 +20,12 @@ detailed analysis of the extensive data collected by Java Flight Recorder.
 The tool chain enables developers and administrators to collect and analyze data 
 from Java applications running locally or deployed in production environments.
 
+%package javadoc
+Summary:  Javadoc for %{name}
+
+%description javadoc
+%{summary}.
+
 %prep
 %setup -q
 
@@ -33,11 +37,15 @@ from Java applications running locally or deployed in production environments.
 %install
 %mvn_install
 
-%files
-/usr/share/java/%{name}
-/usr/share/javadoc/%{name}
-/usr/share/maven-poms/%{name}
-/usr/share/maven-metadata/%{name}.xml
+%files -f .mfiles
+%license LICENSE.txt
+%license THIRDPARTYREADME.txt
+%doc README.md
+
+%files javadoc -f .mfiles-javadoc
+%license LICENSE.txt
+%license THIRDPARTYREADME.txt
+%doc README.md
 
 %changelog
 * Fri Sep 14 2018 Salman Siddiqui <sasiddiq@redhat.com> - 7.0.0-1

From 71283f948f90694732cbbb7dc9b50c357db47261 Mon Sep 17 00:00:00 2001
From: Salman Siddiqui <sasiddiq@redhat.com>
Date: Nov 16 2018 21:33:39 +0000
Subject: [PATCH 13/15] fipmv: replace patch with pom_xpath macro and add javadoc subpackage


---

diff --git a/fix-info-plist-maven-plugin/0_update_ddp_version.patch b/fix-info-plist-maven-plugin/0_update_ddp_version.patch
deleted file mode 100644
index 0860dd1..0000000
--- a/fix-info-plist-maven-plugin/0_update_ddp_version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/pom.xml b/pom.xml
-index 866c23e..d1a1173 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -50,7 +50,7 @@
- 		<dependency>
- 			<groupId>com.googlecode.plist</groupId>
- 			<artifactId>dd-plist</artifactId>
--			<version>1.16</version>
-+			<version>1.21</version>
- 		</dependency>
- 		<dependency>
- 			<groupId>org.tukaani</groupId>
diff --git a/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec b/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec
index 3ceb4b2..35dd2ef 100644
--- a/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec
+++ b/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec
@@ -10,25 +10,27 @@ Source0:    https://github.com/buchen/fix-info-plist-maven-plugin/archive/1.2.ta
 
 BuildArch:  noarch
 
-Patch0: 0_update_ddp_version.patch
-
-BuildRequires:  dd-plist
 BuildRequires:  maven-local
-BuildRequires:  maven-plugin-plugin
+BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
+BuildRequires:  mvn(com.googlecode.plist:dd-plist)
 BuildRequires:  xz-devel
 
-Requires:   java-openjdk
-
 %description
 Small Maven plugin to "fix" the Info.plist file generated by p2 during a Tycho
 product build. This Maven plugin manipulates the Info.plist between the
 materialize-products and archive-products goals of the P2 Directory Tycho
 plugin to provide a custom Info.plist file for Eclipse RCP product.
 
+%package javadoc
+Summary:  Javadoc for %{name}
+
+%description javadoc
+%{summary}.
+
 %prep
-%setup -q -n fix-info-plist-maven-plugin-1.2
+%setup -q
 
-%patch0 -p1
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId='dd-plist']/pom:version" "1.21"
 
 %build
 %mvn_build
@@ -36,11 +38,13 @@ plugin to provide a custom Info.plist file for Eclipse RCP product.
 %install
 %mvn_install
 
-%files
-%{_javadir}/%{name}
-%{_javadocdir}/%{name}
-%{_datadir}/maven-poms/%{name}
-%{_datadir}/maven-metadata/%{name}.xml
+%files -f .mfiles
+%doc README.md
+%license LICENSE
+
+%files javadoc -f .mfiles-javadoc
+%doc README.md
+%license LICENSE
 
 %changelog
 * Tue Oct 16 2018 Salman Siddiqui <sasiddiq@redhat.com> - 1.2-1

From 202f40e69ad64f8218469131eb7b46695268fb8d Mon Sep 17 00:00:00 2001
From: Salman Siddiqui <sasiddiq@redhat.com>
Date: Nov 16 2018 22:14:04 +0000
Subject: [PATCH 14/15] rename ee4j to ee4j-parent


---

diff --git a/ee4j-parent/ee4j-parent.spec b/ee4j-parent/ee4j-parent.spec
new file mode 100644
index 0000000..8795981
--- /dev/null
+++ b/ee4j-parent/ee4j-parent.spec
@@ -0,0 +1,40 @@
+Name:		ee4j-parent
+Version:	1.0.1
+Release:	1%{?dist}
+Summary:	Parent POM file for Eclipse Enterprise for Java projects
+
+License:	EPL-2.0 or GPLv2 with exceptions
+URL:		https://github.com/eclipse-ee4j/ee4j
+
+Source0:	https://github.com/eclipse-ee4j/ee4j/archive/1.0.1.tar.gz
+
+BuildArch:	noarch
+
+BuildRequires:	maven-local
+
+%description
+Eclipse Enterprise for Java (EE4J) is an open source initiative to create 
+standard APIs, implementations of those APIs, and technology compatibility kits
+for Java run-times that enable development, deployment, and management of 
+server-side and cloud-native applications.
+
+%global tarball_name ee4j-%{version}
+
+%prep
+%setup -q -n %{tarball_name}
+
+mv %{_builddir}/%{tarball_name}/parent/pom.xml %{_builddir}/%{tarball_name}/pom.xml
+rm -r %{_builddir}/%{tarball_name}/parent/
+
+%build
+%mvn_build
+
+%install
+%mvn_install
+
+%files -f .mfiles
+%doc README.md
+
+%changelog
+* Fri Sep 21 2018 Salman Siddiqui <sasiddiq@redhat.com> - 1.0.1-1
+- Initial packaging
diff --git a/ee4j-parent/generate_ee4j_tarball.sh b/ee4j-parent/generate_ee4j_tarball.sh
new file mode 100755
index 0000000..daa8ea7
--- /dev/null
+++ b/ee4j-parent/generate_ee4j_tarball.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+wget https://github.com/eclipse-ee4j/ee4j/archive/1.0.1.tar.gz
diff --git a/ee4j/ee4j.spec b/ee4j/ee4j.spec
deleted file mode 100644
index e983511..0000000
--- a/ee4j/ee4j.spec
+++ /dev/null
@@ -1,38 +0,0 @@
-Name:		ee4j
-Version:	1.0.1
-Release:	1%{?dist}
-Summary:	Parent POM file for Eclipse Enterprise for Java projects
-
-License:	EPL-2.0 or GPLv2 with exceptions
-URL:		https://github.com/eclipse-ee4j/ee4j
-
-Source0:	https://github.com/eclipse-ee4j/ee4j/archive/1.0.1.tar.gz
-
-BuildArch:	noarch
-
-BuildRequires:	maven-local
-
-%description
-Eclipse Enterprise for Java (EE4J) is an open source initiative to create 
-standard APIs, implementations of those APIs, and technology compatibility kits
-for Java run-times that enable development, deployment, and management of 
-server-side and cloud-native applications.
-
-%prep
-%autosetup -n ee4j-1.0.1
-
-mv %{_builddir}/%{name}-%{version}/parent/pom.xml %{_builddir}/%{name}-%{version}/pom.xml
-rm -r %{_builddir}/%{name}-%{version}/parent/
-
-%build
-%mvn_build
-
-%install
-%mvn_install
-
-%files -f .mfiles
-%doc README.md
-
-%changelog
-* Fri Sep 21 2018 Salman Siddiqui <sasiddiq@redhat.com> - 1.0.1-1
-- Initial packaging
diff --git a/ee4j/generate_ee4j_tarball.sh b/ee4j/generate_ee4j_tarball.sh
deleted file mode 100755
index daa8ea7..0000000
--- a/ee4j/generate_ee4j_tarball.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-wget https://github.com/eclipse-ee4j/ee4j/archive/1.0.1.tar.gz

From 410470a39a94e681d7ac7ade9daa91aafb909193 Mon Sep 17 00:00:00 2001
From: Salman Siddiqui <sasiddiq@redhat.com>
Date: Nov 16 2018 22:26:54 +0000
Subject: [PATCH 15/15] update owasp-java-encoder to v1.2.2


---

diff --git a/owasp-java-encoder/generate_encoder_tarball.sh b/owasp-java-encoder/generate_encoder_tarball.sh
index 35eba83..24a8ba5 100755
--- a/owasp-java-encoder/generate_encoder_tarball.sh
+++ b/owasp-java-encoder/generate_encoder_tarball.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-wget https://github.com/OWASP/owasp-java-encoder/archive/v1.2.1.tar.gz
+wget https://github.com/OWASP/owasp-java-encoder/archive/v1.2.2.tar.gz
diff --git a/owasp-java-encoder/owasp-java-encoder.spec b/owasp-java-encoder/owasp-java-encoder.spec
index 52bcaf3..bf29ece 100644
--- a/owasp-java-encoder/owasp-java-encoder.spec
+++ b/owasp-java-encoder/owasp-java-encoder.spec
@@ -1,12 +1,12 @@
 Name:		owasp-java-encoder
-Version:	1.2.1
+Version:	1.2.2
 Release:	1%{?dist}
 Summary:	Collection of high-performance low-overhead contextual encoders
 
 License:	BSD
 URL:		https://github.com/OWASP/owasp-java-encoder/
 
-Source0:	https://github.com/OWASP/owasp-java-encoder/archive/v1.2.1.tar.gz
+Source0:	https://github.com/OWASP/owasp-java-encoder/archive/v%{version}.tar.gz
 
 # add OSGi metadata
 Patch0:		0_manifest.patch
@@ -59,5 +59,8 @@ jar ufm %{_builddir}/%{name}-%{version}/core/target/encoder-%{version}.jar %{_bu
 %license LICENSE
 
 %changelog
+* Fri Nov 16 2018 Salman Siddiqui <sasiddiq@redhat.com> - 1.2.2-1
+- Version update
+
 * Wed Aug 08 2018 Salman Siddiqui <sasiddiq@redhat.com> - 1.2.1-1
 - Initial packaging

