From 6e53c17dd457371eb60841fc76df2120e833eddf Mon Sep 17 00:00:00 2001 From: Salman Siddiqui Date: Nov 21 2018 18:45:16 +0000 Subject: [PATCH 1/9] add comment about maven requires generator in fipmv spec --- 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 35dd2ef..e1ea11a 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 @@ -15,6 +15,9 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(com.googlecode.plist:dd-plist) BuildRequires: xz-devel +# maven requires generator will add Require for runtime dependency +# on xz-devel and mvn(com.googlecode.plist:dd-plist) + %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 From 97cf721736cf7174a4e8e17585c0dc1bda1c4df4 Mon Sep 17 00:00:00 2001 From: Salman Siddiqui Date: Nov 22 2018 16:40:17 +0000 Subject: [PATCH 2/9] use snapshot versioning for jmc-core --- diff --git a/jmc-core/jmc-core.spec b/jmc-core/jmc-core.spec index c1268a0..ba46358 100644 --- a/jmc-core/jmc-core.spec +++ b/jmc-core/jmc-core.spec @@ -1,13 +1,41 @@ -Name: jmc-core -Version: 7.0.0 -Release: 1%{?dist} +# Version +%global major 7 +%global minor 0 +%global patchlevel 0 + +# Revision +%global revnum 1 +# set to 1 for hg snapshots, 0 for release +%global usesnapshot 1 + +# SNAPSHOT version +%global hgrevhash ecb68ef82eb7 +%global hgrevdate 20181017 + +%if %{usesnapshot} + %global releasestr %{revnum}.%{hgrevdate}hg%{hgrevhash} +%else + %global releasestr %{revnum} +%endif + +Name: jmc-core +Version: %{major}.%{minor}.%{patchlevel} +Release: %{releasestr}%{?dist} Summary: Core API for Java Mission Control License: UPL URL: http://openjdk.java.net/projects/jmc/ -# original source: http://hg.openjdk.java.net/jmc/jmc/archive/tip.tar.gz -Source0: jmc-core-7.0.0.tar.gz +# original source: http://hg.openjdk.java.net/%%{name}/%%{name}/archive/%%{hgrevhash}.tar.gz +# wget http://hg.openjdk.java.net/%%{name}/%%{name}/archive/%%{hgrevhash}.tar.gz +# tar xzf %%{hgrevhash}.tar.gz +# rm %%{hgrevhash}.tar.gz +# cp -r %%{name}-%%{hgrevhash}/core/ %%{name}-%%{version}/ +# cp %%{name}-%%{hgrevhash}/license/* %%{name}-%%{version}/ +# cp %%{name}-%%{hgrevhash}/README.md %%{name}-%%{version}/ +# tar czf %%{name}-%%{version}.tar.gz %%{name}-%%{version}/ +# rm -r %%{name}-%%{version}/ %%{name}-%%{hgrevhash} +Source0: %{name}-%{version}.tar.gz BuildArch: noarch From 2128a1e560e518594dafc65fe0b25632dada9835 Mon Sep 17 00:00:00 2001 From: Salman Siddiqui Date: Nov 22 2018 21:41:07 +0000 Subject: [PATCH 3/9] update jaf to use 1.2.1 release --- diff --git a/jaf/0_add_manifest.patch b/jaf/0_add_manifest.patch deleted file mode 100644 index 1566647..0000000 --- a/jaf/0_add_manifest.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff --git a/activation/META-INF/MANIFEST.MF b/activation/META-INF/MANIFEST.MF -new file mode 100644 -index 0000000..8896afe ---- /dev/null -+++ b/activation/META-INF/MANIFEST.MF -@@ -0,0 +1,32 @@ -+Manifest-Version: 1.0 -+Bundle-License: http://www.eclipse.org/org/documents/edl-v10.php -+Bundle-SymbolicName: com.sun.activation.javax.activation -+Archiver-Version: Plexus Archiver -+Built-By: sasiddiq -+Bnd-LastModified: 1537549343279 -+Implementation-Vendor-Id: com.sun -+Specification-Title: JavaBeans(TM) Activation Framework Specification -+Bundle-DocURL: https://www.eclipse.org -+Import-Package: com.sun.activation.registries;version="1.2",com.sun.ac -+ tivation.viewers;version="1.2",javax.activation;version="1.2" -+DynamicImport-Package: * -+Export-Package: javax.activation;uses:="com.sun.activation.registries" -+ ;version="1.2",com.sun.activation.registries;version="1.2.1",com.sun. -+ activation.viewers;uses:="javax.activation";version="1.2.1" -+Bundle-Name: JavaBeans Activation Framework -+Extension-Name: javax.activation -+Implementation-Title: javax.activation -+Bundle-Description: JavaBeans Activation Framework -+Automatic-Module-Name: java.activation -+Implementation-Version: 1.2.1-SNAPSHOT -+Specification-Vendor: Eclipse Foundation -+Bundle-ManifestVersion: 2 -+Specification-Vendor: Eclipse Foundation -+Bundle-ManifestVersion: 2 -+Bundle-Vendor: Eclipse Foundation -+Tool: Bnd-0.0.357 -+Implementation-Vendor: Eclipse Foundation -+Bundle-Version: 1.2.1.SNAPSHOT -+Created-By: 1.8.0_181 (Oracle Corporation) -+Build-Jdk: 1.8.0_181 -+Specification-Version: 1.2 -diff --git a/activationapi/META-INF/MANIFEST.MF b/activationapi/META-INF/MANIFEST.MF -new file mode 100644 -index 0000000..4e9185f ---- /dev/null -+++ b/activationapi/META-INF/MANIFEST.MF -@@ -0,0 +1,31 @@ -+Manifest-Version: 1.0 -+Bundle-License: http://www.eclipse.org/org/documents/edl-v10.php -+Bundle-SymbolicName: javax.activation-api -+Archiver-Version: Plexus Archiver -+Built-By: sasiddiq -+Bnd-LastModified: 1537548563135 -+Implementation-Vendor-Id: com.sun -+Specification-Title: javax.activation.javax.activation-api -+Bundle-DocURL: https://www.eclipse.org -+Import-Package: com.sun.activation.registries,javax.activation;version -+ ="1.2" -+DynamicImport-Package: * -+Export-Package: javax.activation;uses:="com.sun.activation.registries" -+ ;version="1.2" -+Bundle-Name: JavaBeans Activation Framework API jar -+Extension-Name: javax.activation -+Implementation-Title: javax.activation.javax.activation-api -+Bundle-Description: JavaBeans Activation Framework API jar -+Automatic-Module-Name: java.activation -+Implementation-Version: 1.2.1-SNAPSHOT -+Specification-Vendor: Eclipse Foundation -+Bundle-ManifestVersion: 2 -+Bundle-Vendor: Eclipse Foundation -+Bundle-ManifestVersion: 2 -+Bundle-Vendor: Eclipse Foundation -+Tool: Bnd-0.0.357 -+Implementation-Vendor: Eclipse Foundation -+Bundle-Version: 1.2.1.SNAPSHOT -+Created-By: 1.8.0_181 (Oracle Corporation) -+Build-Jdk: 1.8.0_181 -+Specification-Version: 1.2 diff --git a/jaf/jaf.spec b/jaf/jaf.spec index 7144f73..ccc863f 100644 --- a/jaf/jaf.spec +++ b/jaf/jaf.spec @@ -1,16 +1,12 @@ -%global tarball_name jaf-initial-contribution - Name: jaf Version: 1.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: JavaBeans Activation Framework License: BSD URL: https://github.com/eclipse-ee4j/jaf -Source0: https://github.com/eclipse-ee4j/jaf/archive/initial-contribution.tar.gz - -Patch0: 0_add_manifest.patch +Source0: https://github.com/eclipse-ee4j/jaf/archive/%{version}.tar.gz BuildArch: noarch @@ -20,6 +16,7 @@ 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.commonjava.maven.plugins:directory-maven-plugin) BuildRequires: mvn(org.eclipse.ee4j:project:pom:) BuildRequires: mvn(org.glassfish.hk2:osgiversion-maven-plugin) @@ -37,20 +34,16 @@ Summary: Javadoc for %{name} %{summary}. %prep -%setup -q -n %{tarball_name} -%patch0 -p1 +%setup -q %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/ - -mkdir -p %{_builddir}/%{tarball_name}/activation/target/classes -cp -r %{_builddir}/%{tarball_name}/activation/META-INF %{_builddir}/%{tarball_name}/activation/target/classes/ - -mkdir -p %{_builddir}/%{tarball_name}/activationapi/target/classes -cp -r %{_builddir}/%{tarball_name}/activationapi/META-INF %{_builddir}/%{tarball_name}/activationapi/target/classes/ +# maven-dependency-plugin in activationapi/pom.xml downloads sources that are +# already available in activation/src/; manually copy those sources to avoid +# build failure due to lack of internet connectivity +mkdir -p %{_builddir}/%{name}-%{version}/activationapi/target/sources/ +cp -r %{_builddir}/%{name}-%{version}/activation/src/main/java/javax/ %{_builddir}/%{name}-%{version}/activationapi/target/sources/ +cp -r %{_builddir}/%{name}-%{version}/activation/src/main/java/com/ %{_builddir}/%{name}-%{version}/activationapi/target/sources/ %build %mvn_build @@ -69,5 +62,8 @@ cp -r %{_builddir}/%{tarball_name}/activationapi/META-INF %{_builddir}/%{tarball %doc README.md %changelog +* Thu Nov 22 2018 Salman Siddiqui - 1.2.1-2 +- Use official version 1.2.1 release + * Fri Sep 21 2018 Salman Siddiqui - 1.2.1-1 - Initial packaging From dab4ca6510c98f5fb0cb3c3ce8b758fc8095c1a0 Mon Sep 17 00:00:00 2001 From: Salman Siddiqui Date: Nov 23 2018 14:27:29 +0000 Subject: [PATCH 4/9] fixed indentation issues in jmc-core spec --- diff --git a/jmc-core/jmc-core.spec b/jmc-core/jmc-core.spec index ba46358..32feff5 100644 --- a/jmc-core/jmc-core.spec +++ b/jmc-core/jmc-core.spec @@ -19,12 +19,12 @@ %endif Name: jmc-core -Version: %{major}.%{minor}.%{patchlevel} -Release: %{releasestr}%{?dist} -Summary: Core API for Java Mission Control +Version: %{major}.%{minor}.%{patchlevel} +Release: %{releasestr}%{?dist} +Summary: Core API for Java Mission Control -License: UPL -URL: http://openjdk.java.net/projects/jmc/ +License: UPL +URL: http://openjdk.java.net/projects/jmc/ # original source: http://hg.openjdk.java.net/%%{name}/%%{name}/archive/%%{hgrevhash}.tar.gz # wget http://hg.openjdk.java.net/%%{name}/%%{name}/archive/%%{hgrevhash}.tar.gz @@ -35,12 +35,12 @@ URL: http://openjdk.java.net/projects/jmc/ # cp %%{name}-%%{hgrevhash}/README.md %%{name}-%%{version}/ # tar czf %%{name}-%%{version}.tar.gz %%{name}-%%{version}/ # rm -r %%{name}-%%{version}/ %%{name}-%%{hgrevhash} -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.gz BuildArch: noarch -BuildRequires: maven-local -BuildRequires: mvn(org.owasp.encoder:encoder) +BuildRequires: maven-local +BuildRequires: mvn(org.owasp.encoder:encoder) %description Java Mission Control is an advanced set of tools that enables efficient and From a6a6562542b6426c57c0490e73de1499066824b6 Mon Sep 17 00:00:00 2001 From: Salman Siddiqui Date: Nov 23 2018 15:07:41 +0000 Subject: [PATCH 5/9] update javamail to use 1.6.3 release --- diff --git a/javamail/0_module_info.patch b/javamail/0_module_info.patch deleted file mode 100644 index 8b094b8..0000000 --- a/javamail/0_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/generate_javamail_tarball.sh b/javamail/generate_javamail_tarball.sh index 2806514..12beed4 100755 --- a/javamail/generate_javamail_tarball.sh +++ b/javamail/generate_javamail_tarball.sh @@ -1,8 +1,3 @@ #!/bin/sh -wget https://github.com/eclipse-ee4j/javamail/archive/initial-contribution.tar.gz -tar xzf initial-contribution.tar.gz -rm initial-contribution.tar.gz -mv javamail-initial-contribution/ javamail-1.6.3/ -tar czf javamail-1.6.3.tar.gz javamail-1.6.3/ -rm -r javamail-1.6.3/ +wget https://github.com/eclipse-ee4j/javamail/archive/1.6.3.tar.gz \ No newline at end of file diff --git a/javamail/javamail.spec b/javamail/javamail.spec index 0b537f5..f962c71 100644 --- a/javamail/javamail.spec +++ b/javamail/javamail.spec @@ -1,22 +1,12 @@ Name: javamail Version: 1.6.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java Mail API License: EPL-2.0 or GPLv2 with exceptions URL: https://github.com/eclipse-ee4j/javamail BuildArch: noarch -# original source: https://github.com/eclipse-ee4j/javamail/archive/initial-contribution.tar.gz -# generate tarball: -# wget wget https://github.com/eclipse-ee4j/javamail/archive/initial-contribution.tar.gz -# tar xzf initial-contribution.tar.gz -# rm initial-contribution.tar.gz -# mv javamail-initial-contribution/ javamail-1.6.3/ -# tar czf javamail-1.6.3.tar.gz javamail-1.6.3/ -# rm -r javamail-1.6.3/ -Source: javamail-1.6.3.tar.gz - -Patch0: 0_module_info.patch +Source: https://github.com/eclipse-ee4j/javamail/archive/%{version}.tar.gz BuildRequires: maven-local BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) @@ -49,12 +39,14 @@ Summary: Javadoc for %{name} %prep %setup -q -%patch0 -p1 - %pom_disable_module android %pom_disable_module javadoc -%pom_remove_dep javax.activation:activation mail +%pom_remove_dep com.sun.activation:jakarta.activation mail + +# Remove profiles containing demos and other stuff that is not +# supposed to be deployable. +%pom_xpath_remove /pom:project/pom:profiles %pom_remove_plugin :maven-javadoc-plugin @@ -87,6 +79,9 @@ ln -sf ../%{name}/javax.mail.jar %{buildroot}%{_javadir}/javax.mail/ %{_javadir}/javax.mail/ %changelog +* Thu Nov 22 2018 Salman Siddiqui - 1.6.3-2 +- Use official version 1.6.3 release + * Tue Oct 16 2018 Salman Siddiqui - 1.6.3-1 - Version update (new sources: https://github.com/eclipse-ee4j/javamail) From 2992d8d41e3c7c30058a1f3aa0ac42c836af502a Mon Sep 17 00:00:00 2001 From: Salman Siddiqui Date: Nov 23 2018 17:39:03 +0000 Subject: [PATCH 6/9] remove unnecessary classes from activationapi jar in jaf --- diff --git a/jaf/generate_jaf_tarball.sh b/jaf/generate_jaf_tarball.sh index 96293d6..0752680 100755 --- a/jaf/generate_jaf_tarball.sh +++ b/jaf/generate_jaf_tarball.sh @@ -1,3 +1,3 @@ #!/bin/bash -wget https://github.com/eclipse-ee4j/jaf/archive/initial-contribution.tar.gz +wget https://github.com/eclipse-ee4j/jaf/archive/1.2.1.tar.gz diff --git a/jaf/jaf.spec b/jaf/jaf.spec index ccc863f..e945e91 100644 --- a/jaf/jaf.spec +++ b/jaf/jaf.spec @@ -38,12 +38,17 @@ Summary: Javadoc for %{name} %pom_disable_module demo -# maven-dependency-plugin in activationapi/pom.xml downloads sources that are -# already available in activation/src/; manually copy those sources to avoid -# build failure due to lack of internet connectivity +# maven-dependency-plugin doesn't work correctly without access to remote repos +%pom_remove_plugin :maven-dependency-plugin activationapi mkdir -p %{_builddir}/%{name}-%{version}/activationapi/target/sources/ cp -r %{_builddir}/%{name}-%{version}/activation/src/main/java/javax/ %{_builddir}/%{name}-%{version}/activationapi/target/sources/ -cp -r %{_builddir}/%{name}-%{version}/activation/src/main/java/com/ %{_builddir}/%{name}-%{version}/activationapi/target/sources/ +%pom_xpath_inject "/pom:project" " + + com.sun.activation + jakarta.activation + 1.2.1 + +" "activationapi/pom.xml" %build %mvn_build From 58191ec2c33a580d4e75321cd2ba72b140cb192d Mon Sep 17 00:00:00 2001 From: Salman Siddiqui Date: Nov 23 2018 19:37:51 +0000 Subject: [PATCH 7/9] update jmc-core to latest snapshot --- diff --git a/jmc-core/generate_jmc_core_tarball.sh b/jmc-core/generate_jmc_core_tarball.sh index b9f9232..953ce7f 100755 --- a/jmc-core/generate_jmc_core_tarball.sh +++ b/jmc-core/generate_jmc_core_tarball.sh @@ -1,10 +1,14 @@ #!/bin/sh - -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 +VER_MAJOR=$(awk '/%global major/{print $NF}' jmc-core.spec) +VER_MINOR=$(awk '/%global minor/{print $NF}' jmc-core.spec) +VER_PATCH=$(awk '/%global patchlevel/{print $NF}' jmc-core.spec) +VERSION=$VER_MAJOR.$VER_MINOR.$VER_PATCH +HGREVHASH=$(awk '/%global hgrevhash/{print $NF}' jmc-core.spec) +wget http://hg.openjdk.java.net/jmc/jmc/archive/$HGREVHASH.tar.gz +tar xzf $HGREVHASH.tar.gz +rm $HGREVHASH.tar.gz +cp -r jmc-$HGREVHASH/core/ jmc-core-$VERSION/ +cp jmc-$HGREVHASH/license/* jmc-core-$VERSION/ +cp jmc-$HGREVHASH/README.md jmc-core-$VERSION/ +tar czf jmc-core-$VERSION.tar.gz jmc-core-$VERSION/ +rm -r jmc-core-$VERSION/ jmc-$HGREVHASH \ No newline at end of file diff --git a/jmc-core/jmc-core.spec b/jmc-core/jmc-core.spec index 32feff5..0a8ec8f 100644 --- a/jmc-core/jmc-core.spec +++ b/jmc-core/jmc-core.spec @@ -9,8 +9,8 @@ %global usesnapshot 1 # SNAPSHOT version -%global hgrevhash ecb68ef82eb7 -%global hgrevdate 20181017 +%global hgrevhash 9aa7085f938b +%global hgrevdate 20181122 %if %{usesnapshot} %global releasestr %{revnum}.%{hgrevdate}hg%{hgrevhash} @@ -29,12 +29,10 @@ URL: http://openjdk.java.net/projects/jmc/ # original source: http://hg.openjdk.java.net/%%{name}/%%{name}/archive/%%{hgrevhash}.tar.gz # wget http://hg.openjdk.java.net/%%{name}/%%{name}/archive/%%{hgrevhash}.tar.gz # tar xzf %%{hgrevhash}.tar.gz -# rm %%{hgrevhash}.tar.gz # cp -r %%{name}-%%{hgrevhash}/core/ %%{name}-%%{version}/ # cp %%{name}-%%{hgrevhash}/license/* %%{name}-%%{version}/ # cp %%{name}-%%{hgrevhash}/README.md %%{name}-%%{version}/ # tar czf %%{name}-%%{version}.tar.gz %%{name}-%%{version}/ -# rm -r %%{name}-%%{version}/ %%{name}-%%{hgrevhash} Source0: %{name}-%{version}.tar.gz BuildArch: noarch @@ -42,6 +40,9 @@ BuildArch: noarch BuildRequires: maven-local BuildRequires: mvn(org.owasp.encoder:encoder) +# maven requires generator will add Require for runtime dependency +# on mvn(org.owasp.encoder:encoder) + %description Java Mission Control is an advanced set of tools that enables efficient and detailed analysis of the extensive data collected by Java Flight Recorder. @@ -76,5 +77,8 @@ Summary: Javadoc for %{name} %doc README.md %changelog +* Fri Nov 23 2018 Salman Siddiqui - 7.0.0-1.20181122hg9aa7085f938b +- Update to latest SNAPSHOT + * Fri Sep 14 2018 Salman Siddiqui - 7.0.0-1 - Initial packaging From 18fc208e28410b69c90630185ae472cab7f02a82 Mon Sep 17 00:00:00 2001 From: Salman Siddiqui Date: Nov 23 2018 22:22:19 +0000 Subject: [PATCH 8/9] add javax.mail alias to javamail --- diff --git a/javamail/javamail.spec b/javamail/javamail.spec index f962c71..24795ad 100644 --- a/javamail/javamail.spec +++ b/javamail/javamail.spec @@ -54,6 +54,10 @@ Summary: Javadoc for %{name} %pom_xpath_inject "pom:modules" "servlet" +# Alias to artifact name used in previous versions +%mvn_alias "com.sun.mail:jakarta.mail" "com.sun.mail:javax.mail" +%mvn_alias "jakarta.mail:jakarta.mail-api" "javax.mail:javax.mail-api" + # 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 \ From fe6811b834b628005203faa0661e5763f9ccb5cd Mon Sep 17 00:00:00 2001 From: Salman Siddiqui Date: Nov 26 2018 16:22:01 +0000 Subject: [PATCH 9/9] include generate jmc-core tarball script in SRPM --- diff --git a/jmc-core/generate_jmc_core_tarball.sh b/jmc-core/generate_jmc_core_tarball.sh index 953ce7f..f43cccb 100755 --- a/jmc-core/generate_jmc_core_tarball.sh +++ b/jmc-core/generate_jmc_core_tarball.sh @@ -1,14 +1,22 @@ #!/bin/sh + +# get version info from spec VER_MAJOR=$(awk '/%global major/{print $NF}' jmc-core.spec) VER_MINOR=$(awk '/%global minor/{print $NF}' jmc-core.spec) VER_PATCH=$(awk '/%global patchlevel/{print $NF}' jmc-core.spec) VERSION=$VER_MAJOR.$VER_MINOR.$VER_PATCH HGREVHASH=$(awk '/%global hgrevhash/{print $NF}' jmc-core.spec) + +# retrieve jmc tarball wget http://hg.openjdk.java.net/jmc/jmc/archive/$HGREVHASH.tar.gz tar xzf $HGREVHASH.tar.gz rm $HGREVHASH.tar.gz + +# copy required files cp -r jmc-$HGREVHASH/core/ jmc-core-$VERSION/ cp jmc-$HGREVHASH/license/* jmc-core-$VERSION/ cp jmc-$HGREVHASH/README.md jmc-core-$VERSION/ + +# create jmc-core tarball tar czf jmc-core-$VERSION.tar.gz jmc-core-$VERSION/ rm -r jmc-core-$VERSION/ jmc-$HGREVHASH \ No newline at end of file diff --git a/jmc-core/jmc-core.spec b/jmc-core/jmc-core.spec index 0a8ec8f..ade0482 100644 --- a/jmc-core/jmc-core.spec +++ b/jmc-core/jmc-core.spec @@ -26,14 +26,9 @@ Summary: Core API for Java Mission Control License: UPL URL: http://openjdk.java.net/projects/jmc/ -# original source: http://hg.openjdk.java.net/%%{name}/%%{name}/archive/%%{hgrevhash}.tar.gz -# wget http://hg.openjdk.java.net/%%{name}/%%{name}/archive/%%{hgrevhash}.tar.gz -# tar xzf %%{hgrevhash}.tar.gz -# cp -r %%{name}-%%{hgrevhash}/core/ %%{name}-%%{version}/ -# cp %%{name}-%%{hgrevhash}/license/* %%{name}-%%{version}/ -# cp %%{name}-%%{hgrevhash}/README.md %%{name}-%%{version}/ -# tar czf %%{name}-%%{version}.tar.gz %%{name}-%%{version}/ +# ./generate_jmc_core_tarball.sh Source0: %{name}-%{version}.tar.gz +Source1: generate_jmc_core_tarball.sh BuildArch: noarch