diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher/about.html 4.9-1/bundles/org.eclipse.equinox.launcher/about.html --- 4.8-1/bundles/org.eclipse.equinox.launcher/about.html 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher/about.html 2018-08-27 15:36:00.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

About This Content

+

About This Content

-

June 5, 2006

-

License

+

November 30, 2017

+

License

-

The Eclipse Foundation makes available all content in this plug-in ("Content"). -Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

+

+ The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

-

If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor’s license -that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

+

+ If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +

\ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher/build.properties 4.9-1/bundles/org.eclipse.equinox.launcher/build.properties --- 4.8-1/bundles/org.eclipse.equinox.launcher/build.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher/build.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2011 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher/launcher.properties 4.9-1/bundles/org.eclipse.equinox.launcher/launcher.properties --- 4.8-1/bundles/org.eclipse.equinox.launcher/launcher.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher/launcher.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2007, 2009 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF 2018-08-27 15:36:00.000000000 +0000 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.launcher;singleton:=true -Bundle-Version: 1.5.0.qualifier +Bundle-Version: 1.5.100.qualifier Main-Class: org.eclipse.equinox.launcher.Main Bundle-ClassPath: . Bundle-Vendor: %providerName diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher/pom.xml 4.9-1/bundles/org.eclipse.equinox.launcher/pom.xml --- 4.8-1/bundles/org.eclipse.equinox.launcher/pom.xml 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher/pom.xml 2018-08-27 15:36:00.000000000 +0000 @@ -14,11 +14,11 @@ rt.equinox.framework org.eclipse.equinox.framework - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.equinox org.eclipse.equinox.launcher - 1.5.0-SNAPSHOT + 1.5.100-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher/src/org/eclipse/core/launcher/Main.java 4.9-1/bundles/org.eclipse.equinox.launcher/src/org/eclipse/core/launcher/Main.java --- 4.8-1/bundles/org.eclipse.equinox.launcher/src/org/eclipse/core/launcher/Main.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher/src/org/eclipse/core/launcher/Main.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Andrew Niefer - IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java 4.9-1/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java --- 4.8-1/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Andrew Niefer - IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/JNIBridge.java 4.9-1/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/JNIBridge.java --- 4.8-1/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/JNIBridge.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/JNIBridge.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java 4.9-1/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java --- 4.8-1/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2018 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/WebStartMain.java 4.9-1/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/WebStartMain.java --- 4.8-1/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/WebStartMain.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/WebStartMain.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/about.html 4.9-1/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/about.html --- 4.8-1/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/about.html 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/about.html 2018-08-27 15:36:00.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

About This Content

+

About This Content

-

June 5, 2006

-

License

+

November 30, 2017

+

License

-

The Eclipse Foundation makes available all content in this plug-in ("Content"). -Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

+

+ The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

-

If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor’s license -that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

+

+ If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +

\ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties 4.9-1/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties --- 4.8-1/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2011 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation @@ -14,4 +17,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20180518-0800 +binaryTag=v20180723-0453 diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/launcher.cocoa.macosx.x86_64.properties 4.9-1/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/launcher.cocoa.macosx.x86_64.properties --- 4.8-1/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/launcher.cocoa.macosx.x86_64.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/launcher.cocoa.macosx.x86_64.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2008, 2009 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/META-INF/MANIFEST.MF 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/META-INF/MANIFEST.MF 2018-08-27 15:36:00.000000000 +0000 @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.equinox.launcher.cocoa.macosx.x86_64;singleton:=true -Bundle-Version: 1.1.700.qualifier +Bundle-Version: 1.1.800.qualifier Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)" Eclipse-PlatformFilter: (& (osgi.ws=cocoa) (osgi.os=macosx) (osgi.arch=x86_64) ) Bundle-Localization: launcher.cocoa.macosx.x86_64 diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml 4.9-1/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml --- 4.8-1/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml 2018-08-27 15:36:00.000000000 +0000 @@ -14,12 +14,12 @@ launcher-binary-parent org.eclipse.equinox.framework - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../launcher-binary-parent org.eclipse.equinox org.eclipse.equinox.launcher.cocoa.macosx.x86_64 - 1.1.700-SNAPSHOT + 1.1.800-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/about.html 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/about.html --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/about.html 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/about.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ - - - - -About - - -

About This Content

- -

June 5, 2006

-

License

- -

The Eclipse Foundation makes available all content in this plug-in ("Content"). -Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

- -

If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor’s license -that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

- - - \ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -############################################################################### -# Copyright (c) 2011 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -bin.includes = META-INF/,\ - launcher.gtk.aix.ppc64.properties,\ - about.html - -customBuildCallbacks=customBuildCallbacks.xml -generateSourceBundle=false -binaryTag=v20180518-0800 diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/customBuildCallbacks.xml 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/customBuildCallbacks.xml --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/customBuildCallbacks.xml 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/customBuildCallbacks.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/forceQualifierUpdate.txt 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/forceQualifierUpdate.txt --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/forceQualifierUpdate.txt 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/forceQualifierUpdate.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -# To force a version qualifier update add the bug here -Bug 403352 - Update all parent versions to match our build stream diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/launcher.gtk.aix.ppc64.properties 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/launcher.gtk.aix.ppc64.properties --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/launcher.gtk.aix.ppc64.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/launcher.gtk.aix.ppc64.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -############################################################################### -# Copyright (c) 2010 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -pluginName = Equinox Launcher GTK AIX PPC64 Fragment -providerName = Eclipse.org - Equinox diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/META-INF/MANIFEST.MF 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/META-INF/MANIFEST.MF 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.aix.ppc64 -Bundle-Version: 1.1.500.qualifier -Fragment-Host: org.eclipse.equinox.launcher;bundle-version="1.0.0" -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=aix) (osgi.arch=ppc64)) -Bundle-Localization: launcher.gtk.aix.ppc64 -Eclipse-BundleShape: dir diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/pom.xml 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/pom.xml --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/pom.xml 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/pom.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ - - - - 4.0.0 - - launcher-binary-parent - org.eclipse.equinox.framework - 4.8.0-SNAPSHOT - ../../launcher-binary-parent - - org.eclipse.equinox - org.eclipse.equinox.launcher.gtk.aix.ppc64 - 1.1.500-SNAPSHOT - eclipse-plugin - - - aix - gtk - ppc64 - - diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/.project 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/.project --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/.project 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/.project 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ - - - org.eclipse.equinox.launcher.gtk.aix.ppc64 - - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - - diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/about.html 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/about.html --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/about.html 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/about.html 2018-08-27 15:36:00.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

About This Content

+

About This Content

-

June 5, 2006

-

License

+

November 30, 2017

+

License

-

The Eclipse Foundation makes available all content in this plug-in ("Content"). -Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

+

+ The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

-

If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor’s license -that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

+

+ If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +

\ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/build.properties 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/build.properties --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/build.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/build.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2015 Red Hat Inc. and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # Red Hat Inc. - initial API and implementation @@ -13,4 +16,4 @@ bin.includes = META-INF/,\ about.html generateSourceBundle=false -binaryTag=v20180518-0800 +binaryTag=v20180723-0453 diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/launcher.gtk.linux.aarch64.properties 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/launcher.gtk.linux.aarch64.properties --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/launcher.gtk.linux.aarch64.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/launcher.gtk.linux.aarch64.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2015 Red Hat Inc. and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # Red Hat Inc. - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/META-INF/MANIFEST.MF 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/META-INF/MANIFEST.MF 2018-08-27 15:36:00.000000000 +0000 @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.aarch64;singleton:=true -Bundle-Version: 1.1.500.qualifier +Bundle-Version: 1.1.600.qualifier Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.5.0)" Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=aarch64)) Bundle-Localization: launcher.gtk.linux.aarch64 diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/pom.xml 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/pom.xml --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/pom.xml 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/pom.xml 2018-08-27 15:36:00.000000000 +0000 @@ -14,12 +14,12 @@ launcher-binary-parent org.eclipse.equinox.framework - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../launcher-binary-parent org.eclipse.equinox org.eclipse.equinox.launcher.gtk.linux.aarch64 - 1.1.500-SNAPSHOT + 1.1.600-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/about.html 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/about.html --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/about.html 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/about.html 2018-08-27 15:36:00.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

About This Content

+

About This Content

-

June 5, 2006

-

License

+

November 30, 2017

+

License

-

The Eclipse Foundation makes available all content in this plug-in ("Content"). -Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

+

+ The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

-

If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor’s license -that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

+

+ If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +

\ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/build.properties 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/build.properties --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/build.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/build.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2011 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation @@ -13,4 +16,4 @@ bin.includes = META-INF/,\ about.html generateSourceBundle=false -binaryTag=v20180518-0800 +binaryTag=v20180723-0453 diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/launcher.gtk.linux.arm.properties 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/launcher.gtk.linux.arm.properties --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/launcher.gtk.linux.arm.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/launcher.gtk.linux.arm.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2015 Red Hat Inc. and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # Red Hat Inc. - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/META-INF/MANIFEST.MF 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/META-INF/MANIFEST.MF 2018-08-27 15:36:00.000000000 +0000 @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.arm;singleton:=true -Bundle-Version: 1.1.500.qualifier +Bundle-Version: 1.1.600.qualifier Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.5.0)" Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=arm)) Bundle-Localization: launcher.gtk.linux.arm diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/pom.xml 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/pom.xml --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/pom.xml 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/pom.xml 2018-08-27 15:36:00.000000000 +0000 @@ -14,12 +14,12 @@ launcher-binary-parent org.eclipse.equinox.framework - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../launcher-binary-parent org.eclipse.equinox org.eclipse.equinox.launcher.gtk.linux.arm - 1.1.500-SNAPSHOT + 1.1.600-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/about.html 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/about.html --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/about.html 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/about.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ - - - - -About - - -

About This Content

- -

June 5, 2006

-

License

- -

The Eclipse Foundation makes available all content in this plug-in ("Content"). -Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

- -

If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor’s license -that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

- - - \ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -############################################################################### -# Copyright (c) 2011 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -bin.includes = META-INF/,\ - launcher.gtk.linux.ppc64.properties,\ - about.html - -customBuildCallbacks=customBuildCallbacks.xml -generateSourceBundle=false -binaryTag=v20180518-0800 diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/customBuildCallbacks.xml 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/customBuildCallbacks.xml --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/customBuildCallbacks.xml 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/customBuildCallbacks.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/forceQualifierUpdate.txt 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/forceQualifierUpdate.txt --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/forceQualifierUpdate.txt 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/forceQualifierUpdate.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# To force a version qualifier update add the bug here -Bug 403352 - Update all parent versions to match our build stream -I20180131-2000 comparator error diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/launcher.gtk.linux.ppc64.properties 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/launcher.gtk.linux.ppc64.properties --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/launcher.gtk.linux.ppc64.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/launcher.gtk.linux.ppc64.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -############################################################################### -# Copyright (c) 2007, 2009 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -pluginName = Equinox Launcher Linux PPC64 Fragment -providerName = Eclipse.org - Equinox diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/META-INF/MANIFEST.MF 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/META-INF/MANIFEST.MF 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.ppc64;singleton:=true -Bundle-Version: 1.1.700.qualifier -Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)" -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64)) -Bundle-Localization: launcher.gtk.linux.ppc64 -Eclipse-BundleShape: dir diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ - - - - 4.0.0 - - launcher-binary-parent - org.eclipse.equinox.framework - 4.8.0-SNAPSHOT - ../../launcher-binary-parent - - org.eclipse.equinox - org.eclipse.equinox.launcher.gtk.linux.ppc64 - 1.1.700-SNAPSHOT - eclipse-plugin - - - linux - gtk - ppc64 - - diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/.project 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/.project --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/.project 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/.project 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ - - - org.eclipse.equinox.launcher.gtk.linux.ppc64 - - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - - diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/about.html 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/about.html --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/about.html 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/about.html 2018-08-27 15:36:00.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

About This Content

+

About This Content

-

June 5, 2006

-

License

+

November 30, 2017

+

License

-

The Eclipse Foundation makes available all content in this plug-in ("Content"). -Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

+

+ The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

-

If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor’s license -that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

+

+ If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +

\ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/build.properties 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/build.properties --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/build.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/build.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2014 Red Hat Inc. and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # Alexander Kurtatkov - initial API and implementation @@ -13,4 +16,4 @@ bin.includes = META-INF/,\ about.html generateSourceBundle=false -binaryTag=v20180518-0800 +binaryTag=v20180723-0453 diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/launcher.gtk.linux.ppc64le.properties 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/launcher.gtk.linux.ppc64le.properties --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/launcher.gtk.linux.ppc64le.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/launcher.gtk.linux.ppc64le.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2014 Red Hat Inc. and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # Alexander Kurtakov - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/META-INF/MANIFEST.MF 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/META-INF/MANIFEST.MF 2018-08-27 15:36:00.000000000 +0000 @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.ppc64le;singleton:=true -Bundle-Version: 1.1.700.qualifier +Bundle-Version: 1.1.800.qualifier Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)" Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64le)) Bundle-Localization: launcher.gtk.linux.ppc64le diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml 2018-08-27 15:36:00.000000000 +0000 @@ -14,12 +14,12 @@ launcher-binary-parent org.eclipse.equinox.framework - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../launcher-binary-parent org.eclipse.equinox org.eclipse.equinox.launcher.gtk.linux.ppc64le - 1.1.700-SNAPSHOT + 1.1.800-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/about.html 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/about.html --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/about.html 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/about.html 2018-08-27 15:36:00.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

About This Content

+

About This Content

-

June 5, 2006

-

License

+

November 30, 2017

+

License

-

The Eclipse Foundation makes available all content in this plug-in ("Content"). -Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

+

+ The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

-

If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor’s license -that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

+

+ If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +

- + \ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2011 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation @@ -14,4 +17,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20180518-0800 +binaryTag=v20180723-0453 diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/launcher.gtk.linux.s390.properties 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/launcher.gtk.linux.s390.properties --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/launcher.gtk.linux.s390.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/launcher.gtk.linux.s390.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2007, 2009 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/META-INF/MANIFEST.MF 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/META-INF/MANIFEST.MF 2018-08-27 15:36:00.000000000 +0000 @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.s390;singleton:=true -Bundle-Version: 1.1.600.qualifier +Bundle-Version: 1.1.700.qualifier Fragment-Host: org.eclipse.equinox.launcher;bundle-version="1.0.0" Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=s390)) Bundle-Localization: launcher.gtk.linux.s390 diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml 2018-08-27 15:36:00.000000000 +0000 @@ -14,12 +14,12 @@ launcher-binary-parent org.eclipse.equinox.framework - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../launcher-binary-parent org.eclipse.equinox org.eclipse.equinox.launcher.gtk.linux.s390 - 1.1.600-SNAPSHOT + 1.1.700-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/about.html 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/about.html --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/about.html 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/about.html 2018-08-27 15:36:00.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

About This Content

+

About This Content

-

June 5, 2006

-

License

+

November 30, 2017

+

License

-

The Eclipse Foundation makes available all content in this plug-in ("Content"). -Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

+

+ The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

-

If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor’s license -that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

+

+ If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +

- + \ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2011 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation @@ -14,4 +17,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20180518-0800 +binaryTag=v20180723-0453 diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/launcher.gtk.linux.s390x.properties 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/launcher.gtk.linux.s390x.properties --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/launcher.gtk.linux.s390x.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/launcher.gtk.linux.s390x.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2007, 2009 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/META-INF/MANIFEST.MF 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/META-INF/MANIFEST.MF 2018-08-27 15:36:00.000000000 +0000 @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.s390x;singleton:=true -Bundle-Version: 1.1.600.qualifier +Bundle-Version: 1.1.700.qualifier Fragment-Host: org.eclipse.equinox.launcher;bundle-version="1.0.0" Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=s390x)) Bundle-Localization: launcher.gtk.linux.s390x diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml 2018-08-27 15:36:00.000000000 +0000 @@ -14,12 +14,12 @@ launcher-binary-parent org.eclipse.equinox.framework - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../launcher-binary-parent org.eclipse.equinox org.eclipse.equinox.launcher.gtk.linux.s390x - 1.1.600-SNAPSHOT + 1.1.700-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/about.html 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/about.html --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/about.html 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/about.html 2018-08-27 15:36:00.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

About This Content

+

About This Content

-

June 5, 2006

-

License

+

November 30, 2017

+

License

-

The Eclipse Foundation makes available all content in this plug-in ("Content"). -Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

+

+ The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

-

If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor’s license -that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

+

+ If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +

\ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2011 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation @@ -14,4 +17,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20180518-0800 +binaryTag=v20180723-0453 diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/launcher.gtk.linux.x86.properties 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/launcher.gtk.linux.x86.properties --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/launcher.gtk.linux.x86.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/launcher.gtk.linux.x86.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2007, 2009 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/META-INF/MANIFEST.MF 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/META-INF/MANIFEST.MF 2018-08-27 15:36:00.000000000 +0000 @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86;singleton:=true -Bundle-Version: 1.1.700.qualifier +Bundle-Version: 1.1.800.qualifier Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)" Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86)) Bundle-Localization: launcher.gtk.linux.x86 diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml 2018-08-27 15:36:00.000000000 +0000 @@ -14,12 +14,12 @@ launcher-binary-parent org.eclipse.equinox.framework - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../launcher-binary-parent org.eclipse.equinox org.eclipse.equinox.launcher.gtk.linux.x86 - 1.1.700-SNAPSHOT + 1.1.800-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/about.html 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/about.html --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/about.html 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/about.html 2018-08-27 15:36:00.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

About This Content

+

About This Content

-

June 5, 2006

-

License

+

November 30, 2017

+

License

-

The Eclipse Foundation makes available all content in this plug-in ("Content"). -Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

+

+ The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

-

If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor’s license -that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

+

+ If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +

\ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2011 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation @@ -14,4 +17,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20180518-0800 +binaryTag=v20180723-0453 diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/launcher.gtk.linux.x86_64.properties 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/launcher.gtk.linux.x86_64.properties --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/launcher.gtk.linux.x86_64.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/launcher.gtk.linux.x86_64.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2007, 2009 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/META-INF/MANIFEST.MF 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/META-INF/MANIFEST.MF 2018-08-27 15:36:00.000000000 +0000 @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86_64;singleton:=true -Bundle-Version: 1.1.700.qualifier +Bundle-Version: 1.1.800.qualifier Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)" Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64)) Bundle-Localization: launcher.gtk.linux.x86_64 diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml --- 4.8-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml 2018-08-27 15:36:00.000000000 +0000 @@ -14,12 +14,12 @@ launcher-binary-parent org.eclipse.equinox.framework - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../launcher-binary-parent org.eclipse.equinox org.eclipse.equinox.launcher.gtk.linux.x86_64 - 1.1.700-SNAPSHOT + 1.1.800-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86/about.html 4.9-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86/about.html --- 4.8-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86/about.html 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86/about.html 2018-08-27 15:36:00.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

About This Content

+

About This Content

-

June 5, 2006

-

License

+

November 30, 2017

+

License

-

The Eclipse Foundation makes available all content in this plug-in ("Content"). -Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

+

+ The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

-

If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor’s license -that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

+

+ If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +

\ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties 4.9-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties --- 4.8-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2011 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation @@ -13,4 +16,4 @@ bin.includes = META-INF/,\ about.html generateSourceBundle=false customBuildCallbacks=customBuildCallbacks.xml -binaryTag=v20180518-0800 +binaryTag=v20180723-0453 diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86/launcher.win32.win32.x86.properties 4.9-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86/launcher.win32.win32.x86.properties --- 4.8-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86/launcher.win32.win32.x86.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86/launcher.win32.win32.x86.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2007, 2009 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86/META-INF/MANIFEST.MF 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86/META-INF/MANIFEST.MF 2018-08-27 15:36:00.000000000 +0000 @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.equinox.launcher.win32.win32.x86; singleton:=true -Bundle-Version: 1.1.700.qualifier +Bundle-Version: 1.1.800.qualifier Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)" Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86)) Bundle-Localization: launcher.win32.win32.x86 diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml 4.9-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml --- 4.8-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml 2018-08-27 15:36:00.000000000 +0000 @@ -14,12 +14,12 @@ launcher-binary-parent org.eclipse.equinox.framework - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../launcher-binary-parent org.eclipse.equinox org.eclipse.equinox.launcher.win32.win32.x86 - 1.1.700-SNAPSHOT + 1.1.800-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/about.html 4.9-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/about.html --- 4.8-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/about.html 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/about.html 2018-08-27 15:36:00.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

About This Content

+

About This Content

-

June 5, 2006

-

License

+

November 30, 2017

+

License

-

The Eclipse Foundation makes available all content in this plug-in ("Content"). -Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

+

+ The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

-

If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor’s license -that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

+

+ If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +

\ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties 4.9-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties --- 4.8-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2011 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation @@ -13,4 +16,4 @@ bin.includes = META-INF/,\ about.html generateSourceBundle=false customBuildCallbacks=customBuildCallbacks.xml -binaryTag=v20180518-0800 +binaryTag=v20180723-0453 diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/launcher.win32.win32.x86_64.properties 4.9-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/launcher.win32.win32.x86_64.properties --- 4.8-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/launcher.win32.win32.x86_64.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/launcher.win32.win32.x86_64.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2007, 2009 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/META-INF/MANIFEST.MF 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/META-INF/MANIFEST.MF 2018-08-27 15:36:00.000000000 +0000 @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.equinox.launcher.win32.win32.x86_64;singleton:=true -Bundle-Version: 1.1.700.qualifier +Bundle-Version: 1.1.800.qualifier Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)" Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86_64)) Bundle-Localization: launcher.win32.win32.x86_64 diff -pruN 4.8-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml 4.9-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml --- 4.8-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml 2018-08-27 15:36:00.000000000 +0000 @@ -14,12 +14,12 @@ launcher-binary-parent org.eclipse.equinox.framework - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../launcher-binary-parent org.eclipse.equinox org.eclipse.equinox.launcher.win32.win32.x86_64 - 1.1.700-SNAPSHOT + 1.1.800-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.osgi/about.html 4.9-1/bundles/org.eclipse.osgi/about.html --- 4.8-1/bundles/org.eclipse.osgi/about.html 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/about.html 2018-08-27 15:36:00.000000000 +0000 @@ -2,27 +2,36 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

About This Content

- -

August 25, 2006

-

License

- -

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

- -

If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

+

About This Content

+ +

November 30, 2017

+

License

+ +

+ The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

+ +

+ If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +

+

Third Party Content

diff -pruN 4.8-1/bundles/org.eclipse.osgi/build.properties 4.9-1/bundles/org.eclipse.osgi/build.properties --- 4.8-1/bundles/org.eclipse.osgi/build.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/build.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2003, 2015 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation @@ -33,5 +36,6 @@ output.. = bin/ javacWarnings..=-raw,unchecked,hiding,unused,warningToken jars.extra.classpath = osgi/osgi.annotation.jar,\ - osgi/function.interface.jar + osgi/function.interface.jar,\ + osgi/j9stubs.jar jre.compilation.profile = JavaSE-1.7 diff -pruN 4.8-1/bundles/org.eclipse.osgi/CDC-1.0_Foundation-1.0.profile 4.9-1/bundles/org.eclipse.osgi/CDC-1.0_Foundation-1.0.profile --- 4.8-1/bundles/org.eclipse.osgi/CDC-1.0_Foundation-1.0.profile 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/CDC-1.0_Foundation-1.0.profile 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2005, 2018 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/CDC-1.1_Foundation-1.1.profile 4.9-1/bundles/org.eclipse.osgi/CDC-1.1_Foundation-1.1.profile --- 4.8-1/bundles/org.eclipse.osgi/CDC-1.1_Foundation-1.1.profile 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/CDC-1.1_Foundation-1.1.profile 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2005, 2018 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/ConsoleManager.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/ConsoleManager.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/ConsoleManager.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/ConsoleManager.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/DefaultStartupMonitor.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/DefaultStartupMonitor.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/DefaultStartupMonitor.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/DefaultStartupMonitor.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2014 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Andrew Niefer - IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAppLauncher.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAppLauncher.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAppLauncher.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAppLauncher.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2014 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2018 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleCapability.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleCapability.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleCapability.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleCapability.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleCollisionHook.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleCollisionHook.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleCollisionHook.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleCollisionHook.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainerAdaptor.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainerAdaptor.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainerAdaptor.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainerAdaptor.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2018 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/Module.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/Module.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/Module.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/Module.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleLoader.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleLoader.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleLoader.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleLoader.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2014 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRequirement.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRequirement.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRequirement.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRequirement.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolutionReport.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolutionReport.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolutionReport.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolutionReport.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisionBuilder.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisionBuilder.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisionBuilder.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisionBuilder.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevision.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevision.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevision.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevision.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisions.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisions.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisions.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisions.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWire.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWire.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWire.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWire.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWiring.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWiring.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWiring.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWiring.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EclipsePlatformNamespace.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EclipsePlatformNamespace.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EclipsePlatformNamespace.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EclipsePlatformNamespace.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EquinoxFragmentNamespace.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EquinoxFragmentNamespace.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EquinoxFragmentNamespace.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EquinoxFragmentNamespace.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EquinoxModuleDataNamespace.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EquinoxModuleDataNamespace.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EquinoxModuleDataNamespace.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EquinoxModuleDataNamespace.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/SystemModule.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/SystemModule.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/SystemModule.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/SystemModule.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/ArrayMap.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/ArrayMap.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/ArrayMap.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/ArrayMap.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/CaseInsensitiveDictionaryMap.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/CaseInsensitiveDictionaryMap.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/CaseInsensitiveDictionaryMap.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/CaseInsensitiveDictionaryMap.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/FilePath.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/FilePath.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/FilePath.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/FilePath.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/Headers.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/Headers.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/Headers.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/Headers.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/KeyedElement.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/KeyedElement.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/KeyedElement.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/KeyedElement.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/KeyedHashSet.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/KeyedHashSet.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/KeyedHashSet.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/KeyedHashSet.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/ObjectPool.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/ObjectPool.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/ObjectPool.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/ObjectPool.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/SecureAction.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/SecureAction.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/SecureAction.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/SecureAction.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSBundleEntry.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSBundleEntry.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSBundleEntry.java 1970-01-01 00:00:00.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSBundleEntry.java 2018-08-27 15:36:00.000000000 +0000 @@ -0,0 +1,112 @@ +/******************************************************************************* + * Copyright (c) 2006, 2018 IBM Corp. and others + * + * This program and the accompanying materials are made available under + * the terms of the Eclipse Public License 2.0 which accompanies this + * distribution and is available at https://www.eclipse.org/legal/epl-2.0/ + * or the Apache License, Version 2.0 which accompanies this distribution and + * is available at https://www.apache.org/licenses/LICENSE-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 [1] and GNU General Public License, version 2 with the + * OpenJDK Assembly Exception [2]. + * + * [1] https://www.gnu.org/software/classpath/license.html + * [2] http://openjdk.java.net/legal/assembly-exception.html + * + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + *******************************************************************************/ + +package org.eclipse.osgi.internal.cds; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import org.eclipse.osgi.storage.bundlefile.BundleEntry; + +/** + * A bundle entry for a class that is found in the shared classes cache + */ +public class CDSBundleEntry extends BundleEntry { + String path; + byte[] classbytes; + BundleEntry wrapped; + + /** + * The constructor + * @param path the path to the class file + * @param classbytes the magic cookie bytes for the class in the shared cache + * @param wrapped the actual bundleEntry where the class comes from + */ + public CDSBundleEntry(String path, byte[] classbytes, BundleEntry wrapped) { + super(); + this.path = path; + this.classbytes = classbytes; + this.wrapped = wrapped; + } + + /* + * (non-Javadoc) + * @see org.eclipse.osgi.baseadaptor.bundlefile.BundleEntry#getFileURL() + * uses the wrapped bundle file to get the actual file url to the content of + * the class on disk. + * + * This should is likely never to be called. + */ + public URL getFileURL() { + return wrapped.getFileURL(); + } + + /* + * (non-Javadoc) + * @see org.eclipse.osgi.baseadaptor.bundlefile.BundleEntry#getInputStream() + * wraps the classbytes into a ByteArrayInputStream. This should not be used + * by classloading. + */ + public InputStream getInputStream() throws IOException { + // someone is trying to get the real bytes of the class file!! + // just return the entry from the wrapped file instead of the magic cookie + return wrapped.getInputStream(); + } + + /* + * (non-Javadoc) + * @see org.eclipse.osgi.baseadaptor.bundlefile.BundleEntry#getBytes() + * if classbytes is not null, it returns the magic cookie for the shared class. This is used to define + * the class during class loading. + * if classbytes is null, it gets the contents from actual BundleEntry and caches it in classbytes. + */ + public byte[] getBytes() throws IOException { + if (classbytes == null) { + classbytes = wrapped.getBytes(); + } + return classbytes; + } + + /* + * (non-Javadoc) + * @see org.eclipse.osgi.baseadaptor.bundlefile.BundleEntry#getLocalURL() + * uses the wrapped bundle file to get the actual local url to the content of + * the class on disk. + * + * This should is likely never to be called. + */ + public URL getLocalURL() { + return wrapped.getLocalURL(); + } + + public String getName() { + return path; + } + + public long getSize() { + return wrapped.getSize(); + } + + public long getTime() { + return wrapped.getTime(); + } +} diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSBundleFile.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSBundleFile.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSBundleFile.java 1970-01-01 00:00:00.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSBundleFile.java 2018-08-27 15:36:00.000000000 +0000 @@ -0,0 +1,139 @@ +/******************************************************************************* + * Copyright (c) 2006, 2018 IBM Corp. and others + * + * This program and the accompanying materials are made available under + * the terms of the Eclipse Public License 2.0 which accompanies this + * distribution and is available at https://www.eclipse.org/legal/epl-2.0/ + * or the Apache License, Version 2.0 which accompanies this distribution and + * is available at https://www.apache.org/licenses/LICENSE-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 [1] and GNU General Public License, version 2 with the + * OpenJDK Assembly Exception [2]. + * + * [1] https://www.gnu.org/software/classpath/license.html + * [2] http://openjdk.java.net/legal/assembly-exception.html + * + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + *******************************************************************************/ + +package org.eclipse.osgi.internal.cds; + +import com.ibm.oti.shared.SharedClassURLHelper; +import java.net.MalformedURLException; +import java.net.URL; +import org.eclipse.osgi.storage.bundlefile.BundleEntry; +import org.eclipse.osgi.storage.bundlefile.BundleFile; +import org.eclipse.osgi.storage.bundlefile.BundleFileWrapper; + +/** + * Wraps an actual BundleFile object for purposes of loading classes from the + * shared classes cache. + */ +public class CDSBundleFile extends BundleFileWrapper { + private final static String classFileExt = ".class"; //$NON-NLS-1$ + private URL url; // the URL to the content of the real bundle file + private SharedClassURLHelper urlHelper; // the url helper set by the classloader + private boolean primed = false; + + /** + * The constructor + * @param wrapped the real bundle file + */ + public CDSBundleFile(BundleFile wrapped) { + super(wrapped); + // get the url to the content of the real bundle file + try { + this.url = new URL("file", "", wrapped.getBaseFile().getAbsolutePath()); //$NON-NLS-1$ //$NON-NLS-2$ + } catch (MalformedURLException e) { + // do nothing + } + } + + public CDSBundleFile(BundleFile bundleFile, SharedClassURLHelper urlHelper) { + this(bundleFile); + this.urlHelper = urlHelper; + } + + /* + * (non-Javadoc) + * @see org.eclipse.osgi.storage.bundlefile.BundleFile#getEntry(java.lang.String) + * + * If path is not for a class then just use the wrapped bundle file to answer the call. + * If the path is for a class, it returns a CDSBundleEntry object. + * If the path is for a class, it will look for the magic cookie in the + * shared classes cache. If found, the bytes representing the magic cookie are stored in CDSBundleEntry object. + */ + public BundleEntry getEntry(String path) { + BundleEntry wrappedEntry = super.getEntry(path); + if (wrappedEntry == null) { + return null; + } + if (!primed || !path.endsWith(classFileExt)) { + return wrappedEntry; + } + + byte[] classbytes = getClassBytes(path.substring(0, path.length() - classFileExt.length())); + BundleEntry be = new CDSBundleEntry(path, classbytes, wrappedEntry); + return be; + } + + /** + * Returns the file url to the content of the actual bundle file + * @return the file url to the content of the actual bundle file + */ + URL getURL() { + return url; + } + + /** + * Returns the url helper for this bundle file. This is set by the + * class loading hook + * @return the url helper for this bundle file + */ + SharedClassURLHelper getURLHelper() { + return urlHelper; + } + + /** + * Sets the url helper for this bundle file. This is called by the + * class loading hook. + * @param urlHelper the url helper + */ + void setURLHelper(SharedClassURLHelper urlHelper) { + this.urlHelper = urlHelper; + this.primed = false; // always unprime when a new urlHelper is set + } + + /** + * Sets the primed flag for the bundle file. This is called by the + * class loading hook after the first class has been loaded from disk for + * this bundle file. + * @param primed the primed flag + */ + void setPrimed(boolean primed) { + this.primed = primed; + } + + /** + * Searches in the shared classes cache for the specified class name. + * @param name the name of the class + * @return the magic cookie to the shared class or null if the class is not in the cache. + */ + private byte[] getClassBytes(String name) { + if (urlHelper == null || url == null) + return null; + return urlHelper.findSharedClass(null, url, name); + } + + /** + * Returns the primed flag for this bundle file. + * @return the primed flag + */ + public boolean getPrimed() { + return this.primed; + } +} diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSHookConfigurator.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSHookConfigurator.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSHookConfigurator.java 1970-01-01 00:00:00.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSHookConfigurator.java 2018-08-27 15:36:00.000000000 +0000 @@ -0,0 +1,67 @@ +/******************************************************************************* + * Copyright (c) 2006, 2018 IBM Corp. and others + * + * This program and the accompanying materials are made available under + * the terms of the Eclipse Public License 2.0 which accompanies this + * distribution and is available at https://www.eclipse.org/legal/epl-2.0/ + * or the Apache License, Version 2.0 which accompanies this distribution and + * is available at https://www.apache.org/licenses/LICENSE-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 [1] and GNU General Public License, version 2 with the + * OpenJDK Assembly Exception [2]. + * + * [1] https://www.gnu.org/software/classpath/license.html + * [2] http://openjdk.java.net/legal/assembly-exception.html + * + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + *******************************************************************************/ + +package org.eclipse.osgi.internal.cds; + +import org.eclipse.osgi.framework.log.FrameworkLogEntry; +import org.eclipse.osgi.internal.framework.EquinoxContainer; +import org.eclipse.osgi.internal.hookregistry.HookConfigurator; +import org.eclipse.osgi.internal.hookregistry.HookRegistry; +import org.eclipse.osgi.internal.log.EquinoxLogServices; + +public class CDSHookConfigurator implements HookConfigurator { + + private static final String REPORT_ERRORS = "j9.cds.reporterrors"; //$NON-NLS-1$ + private static final String DISABLE_CDS = "j9.cds.disable"; //$NON-NLS-1$ + private static final String OLD_CDS_CONFIGURATOR = "com.ibm.cds.CDSHookConfigurator"; //$NON-NLS-1$ + private static final String J9_SHARED_CLASS_HELPER_CLASS = "com.ibm.oti.shared.SharedClassHelperFactory"; //$NON-NLS-1$ + + public void addHooks(HookRegistry hookRegistry) { + boolean disableCDS = Boolean.valueOf(hookRegistry.getConfiguration().getProperty(DISABLE_CDS)); + if (disableCDS) { + return; + } + // check for the external com.ibm.cds system.bundle fragment + try { + Class.forName(OLD_CDS_CONFIGURATOR); + // the old com.ibm.cds fragment is installed; disable build-in one + return; + } catch (ClassNotFoundException e) { + // expected + } + try { + Class.forName(J9_SHARED_CLASS_HELPER_CLASS); + } catch (ClassNotFoundException e) { + boolean reportErrors = Boolean.valueOf(hookRegistry.getConfiguration().getProperty(REPORT_ERRORS)); + // not running on J9 + if (reportErrors) { + EquinoxContainer container = hookRegistry.getContainer(); + EquinoxLogServices logServices = container.getLogServices(); + logServices.log(EquinoxContainer.NAME, FrameworkLogEntry.WARNING, "The J9 Class Sharing Adaptor will not work in this configuration. You are not running on a J9 Java VM.", null); //$NON-NLS-1$ + } + return; + } + + new CDSHookImpls().registerHooks(hookRegistry); + } + +} diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSHookImpls.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSHookImpls.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSHookImpls.java 1970-01-01 00:00:00.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSHookImpls.java 2018-08-27 15:36:00.000000000 +0000 @@ -0,0 +1,229 @@ +/******************************************************************************* + * Copyright (c) 2006, 2018 IBM Corp. and others + * + * This program and the accompanying materials are made available under + * the terms of the Eclipse Public License 2.0 which accompanies this + * distribution and is available at https://www.eclipse.org/legal/epl-2.0/ + * or the Apache License, Version 2.0 which accompanies this distribution and + * is available at https://www.apache.org/licenses/LICENSE-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 [1] and GNU General Public License, version 2 with the + * OpenJDK Assembly Exception [2]. + * + * [1] https://www.gnu.org/software/classpath/license.html + * [2] http://openjdk.java.net/legal/assembly-exception.html + * + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + *******************************************************************************/ + +package org.eclipse.osgi.internal.cds; + +import com.ibm.oti.shared.HelperAlreadyDefinedException; +import com.ibm.oti.shared.Shared; +import com.ibm.oti.shared.SharedClassHelperFactory; +import com.ibm.oti.shared.SharedClassURLHelper; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import org.eclipse.osgi.internal.hookregistry.BundleFileWrapperFactoryHook; +import org.eclipse.osgi.internal.hookregistry.ClassLoaderHook; +import org.eclipse.osgi.internal.hookregistry.HookRegistry; +import org.eclipse.osgi.internal.loader.ModuleClassLoader; +import org.eclipse.osgi.internal.loader.classpath.ClasspathEntry; +import org.eclipse.osgi.internal.loader.classpath.ClasspathManager; +import org.eclipse.osgi.internal.loader.classpath.FragmentClasspath; +import org.eclipse.osgi.storage.BundleInfo.Generation; +import org.eclipse.osgi.storage.bundlefile.BundleEntry; +import org.eclipse.osgi.storage.bundlefile.BundleFile; +import org.eclipse.osgi.storage.bundlefile.BundleFileWrapper; +import org.eclipse.osgi.storage.bundlefile.BundleFileWrapperChain; + +public class CDSHookImpls extends ClassLoaderHook implements BundleFileWrapperFactoryHook { + private static SharedClassHelperFactory factory = Shared.getSharedClassHelperFactory(); + + // With Equinox bug 226038 (v3.4), the framework will now pass an instance + // of BundleFileWrapperChain rather than the wrapped BundleFile. This is + // so that multiple wrapping hooks can each wrap the BundleFile and all + // wrappers are accessible. + // + // The Wrapper chain will look like below: + // WrapperChain -> Wrapper -> WrapperChain -> CDSBundleFile -> WrapperChain -> BundleFile + // + private static CDSBundleFile getCDSBundleFile(BundleFile bundleFile) { + CDSBundleFile cdsBundleFile = null; + + if (bundleFile instanceof BundleFileWrapperChain) { + // Equinox > 3.4 + BundleFile wrapped = null; + do { + wrapped = ((BundleFileWrapperChain) bundleFile).getWrapped(); + if (wrapped instanceof CDSBundleFile) { + cdsBundleFile = (CDSBundleFile) wrapped; + break; + } + + //Go to next wrapper chain. + bundleFile = ((BundleFileWrapperChain) bundleFile).getNext(); + } while (wrapped != null); + } + return cdsBundleFile; + } + + public void recordClassDefine(String name, Class clazz, byte[] classbytes, ClasspathEntry classpathEntry, BundleEntry entry, ClasspathManager manager) { // only attempt to record the class define if: + // 1) the class was found (clazz != null) + // 2) the class has the magic class number CAFEBABE indicating a real class + // 3) the bundle file for the classpath entry is of type CDSBundleFile + // 4) class bytes is same as passed to weaving hook i.e. weaving hook did not modify the class bytes + if ((null == clazz) || (false == hasMagicClassNumber(classbytes)) || (null == getCDSBundleFile(classpathEntry.getBundleFile()))) { + return; + } + try { + // check if weaving hook modified the class bytes + byte originalClassBytes[] = entry.getBytes(); + if (originalClassBytes != classbytes) { + // weaving hook has potentially modified the class bytes + boolean modified = false; + if (originalClassBytes.length == classbytes.length) { + // do a byte-by-byte comparison + modified = !Arrays.equals(classbytes, originalClassBytes); + } else { + modified = true; + } + if (modified) { + // Class bytes have been modified by weaving hooks. + // Such classes need to be stored as Orphans, so skip the call to storeSharedClass() + return; + } + } + } catch (IOException e) { + // this should never happen, but in case it does, its safe to return + return; + } + + CDSBundleFile cdsFile = getCDSBundleFile(classpathEntry.getBundleFile()); + + if (null == cdsFile.getURL()) { + // something went wrong trying to determine the url to the real bundle file + return; + } + + // look for the urlHelper; if it does not exist then we are not sharing for this class loader + SharedClassURLHelper urlHelper = cdsFile.getURLHelper(); + if (urlHelper == null) { + // this should never happen but just in case get the helper from the base host bundle file. + CDSBundleFile hostBundleFile = getCDSBundleFile(manager.getGeneration().getBundleFile()); + if (null != hostBundleFile) { + // try getting the helper from the host base cdsFile + urlHelper = hostBundleFile.getURLHelper(); + } + + if (null != urlHelper) { + cdsFile.setURLHelper(urlHelper); + } + } + if (null != urlHelper) { + // store the class in the cache + urlHelper.storeSharedClass(null, cdsFile.getURL(), clazz); + cdsFile.setPrimed(true); + } + } + + private boolean hasMagicClassNumber(byte[] classbytes) { + if (classbytes == null || classbytes.length < 4) + return false; + // TODO maybe there is a better way to do this? I'm not sure why I had to AND each byte with the value I was checking ... + return (classbytes[0] & 0xCA) == 0xCA && (classbytes[1] & 0xFE) == 0xFE && (classbytes[2] & 0xBA) == 0xBA && (classbytes[3] & 0xBE) == 0xBE; + } + + public void classLoaderCreated(ModuleClassLoader classLoader) { + // try to get the url helper for this class loader + if (factory == null) { + return; + } + try { + SharedClassURLHelper urlHelper = factory.getURLHelper(classLoader); + boolean minimizeUpdateChecks = urlHelper.setMinimizeUpdateChecks(); + // set the url helper for the host base CDSBundleFile + CDSBundleFile hostFile = getCDSBundleFile(classLoader.getClasspathManager().getGeneration().getBundleFile()); + if (hostFile != null) { + hostFile.setURLHelper(urlHelper); + if (minimizeUpdateChecks) { + // no need to prime if we were able to setMinimizeUpdateChecks + hostFile.setPrimed(true); + } + } + // No need to prime if we were able to setMinimizeUpdateChecks. + // Mark all the BundleFiles on the classpath as primed. + ClasspathManager cpManager = classLoader.getClasspathManager(); + for (ClasspathEntry entry : cpManager.getHostClasspathEntries()) { + CDSBundleFile cdsBundleFile = getCDSBundleFile(entry.getBundleFile()); + if (cdsBundleFile != null) { + cdsBundleFile.setURLHelper(urlHelper); + if (minimizeUpdateChecks) { + cdsBundleFile.setPrimed(true); + } + } + } + for (FragmentClasspath fragCP : cpManager.getFragmentClasspaths()) { + for (ClasspathEntry entry : fragCP.getEntries()) { + CDSBundleFile cdsBundleFile = getCDSBundleFile(entry.getBundleFile()); + if (cdsBundleFile != null) { + cdsBundleFile.setURLHelper(urlHelper); + if (minimizeUpdateChecks) { + cdsBundleFile.setPrimed(true); + } + } + } + } + } catch (HelperAlreadyDefinedException e) { + // We should never get here. + // If we do, we simply won't share for this ClassLoader + } + } + + public boolean addClassPathEntry(ArrayList cpEntries, String cp, ClasspathManager hostmanager, Generation sourceGeneration) { + CDSBundleFile hostFile = getCDSBundleFile(hostmanager.getGeneration().getBundleFile()); + CDSBundleFile sourceFile = getCDSBundleFile(sourceGeneration.getBundleFile()); + if ((hostFile != sourceFile) && (null != hostFile) && (null != sourceFile)) { + // Set the helper that got set on the host base bundle file in classLoaderCreated. + // This is to handle the case where fragments are dynamically attached + SharedClassURLHelper urlHelper = hostFile.getURLHelper(); + sourceFile.setURLHelper(urlHelper); + sourceFile.setPrimed(hostFile.getPrimed()); + } + + return false; + } + + //////////////// BundleFileWrapperFactoryHook ////////////// + public BundleFileWrapper wrapBundleFile(BundleFile bundleFile, Generation generation, boolean base) { + // wrap the real bundle file for purposes of loading shared classes. + CDSBundleFile newBundleFile; + if (!base && generation.getBundleInfo().getBundleId() != 0) { + // initialize the urlHelper from the base one. + SharedClassURLHelper urlHelper = null; + BundleFile baseFile = generation.getBundleFile(); + if ((baseFile = getCDSBundleFile(baseFile)) != null) { + urlHelper = ((CDSBundleFile) baseFile).getURLHelper(); + } + newBundleFile = new CDSBundleFile(bundleFile, urlHelper); + } else { + newBundleFile = new CDSBundleFile(bundleFile); + } + + return newBundleFile; + } + + void registerHooks(HookRegistry hookRegistry) { + // only register if sharing is enabled + if (!Shared.isSharingEnabled()) { + return; + } + hookRegistry.addClassLoaderHook(this); + hookRegistry.addBundleFileWrapperFactoryHook(this); + } +} diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/AtomicLazyInitializer.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/AtomicLazyInitializer.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/AtomicLazyInitializer.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/AtomicLazyInitializer.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2014, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/Capabilities.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/Capabilities.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/Capabilities.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/Capabilities.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/ComputeNodeOrder.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/ComputeNodeOrder.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/ComputeNodeOrder.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/ComputeNodeOrder.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/EquinoxReentrantLock.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/EquinoxReentrantLock.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/EquinoxReentrantLock.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/EquinoxReentrantLock.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2014 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/InternalUtils.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/InternalUtils.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/InternalUtils.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/InternalUtils.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/LockSet.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/LockSet.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/LockSet.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/LockSet.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/Debug.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/Debug.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/Debug.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/Debug.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2018 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/EclipseDebugTrace.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/EclipseDebugTrace.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/EclipseDebugTrace.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/EclipseDebugTrace.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/FrameworkDebugTraceEntry.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/FrameworkDebugTraceEntry.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/FrameworkDebugTraceEntry.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/FrameworkDebugTraceEntry.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/AliasMapper.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/AliasMapper.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/AliasMapper.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/AliasMapper.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/BundleContextImpl.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/BundleContextImpl.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/BundleContextImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/BundleContextImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/ContextFinder.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/ContextFinder.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/ContextFinder.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/ContextFinder.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/DTOBuilder.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/DTOBuilder.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/DTOBuilder.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/DTOBuilder.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxBundle.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxBundle.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxBundle.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxBundle.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainerAdaptor.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainerAdaptor.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainerAdaptor.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainerAdaptor.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainer.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainer.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainer.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainer.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxEventPublisher.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxEventPublisher.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxEventPublisher.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxEventPublisher.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/FilterImpl.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/FilterImpl.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/FilterImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/FilterImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/PackageAdminImpl.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/PackageAdminImpl.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/PackageAdminImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/PackageAdminImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/StartLevelImpl.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/StartLevelImpl.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/StartLevelImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/StartLevelImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/OSGiFrameworkHooks.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/OSGiFrameworkHooks.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/OSGiFrameworkHooks.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/OSGiFrameworkHooks.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/osname.aliases 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/osname.aliases --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/osname.aliases 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/osname.aliases 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ######################################################################## # Copyright (c) 2003, 2015 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/processor.aliases 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/processor.aliases --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/processor.aliases 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/processor.aliases 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ######################################################################## # Copyright (c) 2003, 2005 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/StorageSaver.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/StorageSaver.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/StorageSaver.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/StorageSaver.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/XMLParsingServiceFactory.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/XMLParsingServiceFactory.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/XMLParsingServiceFactory.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/XMLParsingServiceFactory.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2014 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/ActivatorHookFactory.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/ActivatorHookFactory.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/ActivatorHookFactory.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/ActivatorHookFactory.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/BundleFileWrapperFactoryHook.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/BundleFileWrapperFactoryHook.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/BundleFileWrapperFactoryHook.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/BundleFileWrapperFactoryHook.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/ClassLoaderHook.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/ClassLoaderHook.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/ClassLoaderHook.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/ClassLoaderHook.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -305,4 +308,21 @@ public abstract class ClassLoaderHook { return false; } + /** + * Returns the filtered list of ClasspathEntry instances for the given class, resource or entry. + * A {@code null} value may be returned in which case the find process will go over all the host and + * fragment entries in order to find the given entity which is the default behavior. + * Any non-null return value including an empty list will only look at the entries in the returned list. + * + * This method is used within {@link ClasspathManager#findLocalResource(String)}, {@link ClasspathManager#findLocalResources(String)}, + * {@link ClasspathManager#findLocalClass(String) } and {@link ClasspathManager#findLocalEntry(String) } + * + * @param name the name of the requested class, resource or entry + * @param manager the classpath manager used to find the requested class, resource or entry + * @return the array of ClassPathEntry objects to use to load this given entity + */ + public ClasspathEntry[] getClassPathEntries(String name, ClasspathManager manager) { + // do nothing by default + return null; + } } diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/HookConfigurator.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/HookConfigurator.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/HookConfigurator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/HookConfigurator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/HookRegistry.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/HookRegistry.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/HookRegistry.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/HookRegistry.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -14,8 +17,14 @@ package org.eclipse.osgi.internal.hookre import java.io.IOException; import java.io.InputStream; import java.net.URL; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.List; +import java.util.Properties; import org.eclipse.osgi.framework.log.FrameworkLogEntry; +import org.eclipse.osgi.internal.cds.CDSHookConfigurator; import org.eclipse.osgi.internal.framework.EquinoxConfiguration; import org.eclipse.osgi.internal.framework.EquinoxContainer; import org.eclipse.osgi.internal.hooks.DevClassLoadingHook; @@ -103,6 +112,7 @@ public final class HookRegistry { addClassLoaderHook(new EclipseLazyStarter(container)); addClassLoaderHook(new WeavingHookConfigurator(container)); configurators.add(SignedBundleHook.class.getName()); + configurators.add(CDSHookConfigurator.class.getName()); loadConfigurators(configurators, errors); // set to read-only initialized = true; diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/StorageHookFactory.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/StorageHookFactory.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/StorageHookFactory.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/StorageHookFactory.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/DevClassLoadingHook.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/DevClassLoadingHook.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/DevClassLoadingHook.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/DevClassLoadingHook.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/EclipseLazyStarter.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/EclipseLazyStarter.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/EclipseLazyStarter.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/EclipseLazyStarter.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/DependentPolicy.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/DependentPolicy.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/DependentPolicy.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/DependentPolicy.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/GlobalPolicy.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/GlobalPolicy.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/GlobalPolicy.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/GlobalPolicy.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/IBuddyPolicy.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/IBuddyPolicy.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/IBuddyPolicy.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/IBuddyPolicy.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/PolicyHandler.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/PolicyHandler.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/PolicyHandler.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/PolicyHandler.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/RegisteredPolicy.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/RegisteredPolicy.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/RegisteredPolicy.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/RegisteredPolicy.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/SystemPolicy.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/SystemPolicy.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/SystemPolicy.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/SystemPolicy.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoader.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoader.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoader.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoader.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoaderSources.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoaderSources.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoaderSources.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoaderSources.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathEntry.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathEntry.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathEntry.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathEntry.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathManager.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathManager.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathManager.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathManager.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -371,25 +374,44 @@ public class ClasspathManager { private URL findLocalResourceImpl(String resource, int classPathIndex) { Module m = generation.getRevision().getRevisions().getModule(); URL result = null; - int curIndex = 0; - for (ClasspathEntry cpEntry : entries) { - if (cpEntry != null) { - result = cpEntry.findResource(resource, m, curIndex); - if (result != null && (classPathIndex == -1 || classPathIndex == curIndex)) { - return result; - } + int[] curIndex = {0}; + + // look in hook specific entries if any + for (ClassLoaderHook hook : hookRegistry.getClassLoaderHooks()) { + ClasspathEntry[] hookEntries = hook.getClassPathEntries(resource, this); + if (hookEntries != null) { + return findLocalResourceImpl(resource, hookEntries, m, classPathIndex, curIndex); } - curIndex++; } - // look in fragments + + curIndex[0] = 0; + // look in classpath entries + result = findLocalResourceImpl(resource, entries, m, classPathIndex, curIndex); + if (result != null) { + return result; + } + + // look in fragment entries for (FragmentClasspath fragCP : getFragmentClasspaths()) { - for (ClasspathEntry cpEntry : fragCP.getEntries()) { - result = cpEntry.findResource(resource, m, curIndex); - if (result != null && (classPathIndex == -1 || classPathIndex == curIndex)) { + result = findLocalResourceImpl(resource, fragCP.getEntries(), m, classPathIndex, curIndex); + if (result != null) { + return result; + } + } + + return null; + } + + private URL findLocalResourceImpl(String resource, ClasspathEntry[] cpEntries, Module m, int classPathIndex, int[] curIndex) { + URL result; + for (ClasspathEntry cpEntry : cpEntries) { + if (cpEntry != null) { + result = cpEntry.findResource(resource, m, curIndex[0]); + if (result != null && (classPathIndex == -1 || classPathIndex == curIndex[0])) { return result; } - curIndex++; } + curIndex[0]++; } return null; } @@ -402,29 +424,40 @@ public class ClasspathManager { public Enumeration findLocalResources(String resource) { Module m = generation.getRevision().getRevisions().getModule(); List resources = new ArrayList<>(6); - int classPathIndex = 0; - for (ClasspathEntry cpEntry : entries) { - if (cpEntry != null) { - URL url = cpEntry.findResource(resource, m, classPathIndex); - if (url != null) { - resources.add(url); - } + int[] classPathIndex = {0}; + + // look in hook specific entries if any + for (ClassLoaderHook hook : hookRegistry.getClassLoaderHooks()) { + ClasspathEntry[] hookEntries = hook.getClassPathEntries(resource, this); + if (hookEntries != null) { + findLocalResources(resource, hookEntries, m, classPathIndex, resources); + return resources.size() > 0 ? Collections.enumeration(resources): EMPTY_ENUMERATION; } - classPathIndex++; } - // look in fragments + + classPathIndex[0] = 0; + // look in host classpath entries + findLocalResources(resource, entries, m, classPathIndex, resources); + // look in fragment entries for (FragmentClasspath fragCP : getFragmentClasspaths()) { - for (ClasspathEntry cpEntry : fragCP.getEntries()) { - URL url = cpEntry.findResource(resource, m, classPathIndex); + findLocalResources(resource, fragCP.getEntries(), m, classPathIndex, resources); + } + + if (resources.size() > 0) + return Collections.enumeration(resources); + return EMPTY_ENUMERATION; + } + + private void findLocalResources(String resource, ClasspathEntry[] cpEntries, Module m, int[] classPathIndex, List resources) { + for (ClasspathEntry cpEntry : cpEntries) { + if (cpEntry != null) { + URL url = cpEntry.findResource(resource, m, classPathIndex[0]); if (url != null) { resources.add(url); } - classPathIndex++; } + classPathIndex[0]++; } - if (resources.size() > 0) - return Collections.enumeration(resources); - return EMPTY_ENUMERATION; } /** @@ -445,29 +478,48 @@ public class ClasspathManager { */ public BundleEntry findLocalEntry(String path, int classPathIndex) { BundleEntry result = null; - int curIndex = 0; - for (int i = 0; i < entries.length; i++) { - if (entries[i] != null) { - result = entries[i].findEntry(path); - if (result != null && (classPathIndex == -1 || classPathIndex == curIndex)) - return result; + int[] curIndex = {0}; + + // look in hook specific entries if any + for (ClassLoaderHook hook : hookRegistry.getClassLoaderHooks()) { + ClasspathEntry[] hookEntries = hook.getClassPathEntries(path, this); + if (hookEntries != null) { + return findLocalEntry(path, hookEntries, classPathIndex, curIndex); } - curIndex++; } - // look in fragments - FragmentClasspath[] currentFragments = getFragmentClasspaths(); - for (int i = 0; i < currentFragments.length; i++) { - ClasspathEntry[] fragEntries = currentFragments[i].getEntries(); - for (int j = 0; j < fragEntries.length; j++) { - result = fragEntries[j].findEntry(path); - if (result != null && (classPathIndex == -1 || classPathIndex == curIndex)) - return result; - curIndex++; + + curIndex[0] = 0; + // look in classpath entries + result = findLocalEntry(path, entries, classPathIndex, curIndex); + if (result != null) { + return result; + } + + // look in fragment entries + for (FragmentClasspath fragCP : getFragmentClasspaths()) { + result = findLocalEntry(path, fragCP.getEntries(), classPathIndex, curIndex); + if (result != null) { + return result; } } + return null; } + private BundleEntry findLocalEntry(String path, ClasspathEntry[] cpEntries, int classPathIndex, int[] curIndex) { + BundleEntry result = null; + for (ClasspathEntry cpEntry : cpEntries) { + if (cpEntry != null) { + result = cpEntry.findEntry(path); + if (result != null && (classPathIndex == -1 || classPathIndex == curIndex[0])) { + return result; + } + } + curIndex[0]++; + } + return result; + } + /** * Finds a local class by searching the ClasspathEntry objects of the classpath manager. * This method will first call all the configured class loader hooks @@ -508,27 +560,46 @@ public class ClasspathManager { } private Class findLocalClassImpl(String classname, List hooks) throws ClassNotFoundException { - Class result = null; - for (int i = 0; i < entries.length; i++) { - if (entries[i] != null) { - result = findClassImpl(classname, entries[i], hooks); - if (result != null) - return result; + Class result; + + // look in hook specific entries if any + for (ClassLoaderHook hook : hookRegistry.getClassLoaderHooks()) { + ClasspathEntry[] hookEntries = hook.getClassPathEntries(classname, this); + if (hookEntries != null) { + return findLocalClassImpl(classname, hookEntries, hooks); } } - // look in fragments. - FragmentClasspath[] currentFragments = getFragmentClasspaths(); - for (int i = 0; i < currentFragments.length; i++) { - ClasspathEntry[] fragEntries = currentFragments[i].getEntries(); - for (int j = 0; j < fragEntries.length; j++) { - result = findClassImpl(classname, fragEntries[j], hooks); - if (result != null) - return result; + + // look in classpath entries + result = findLocalClassImpl(classname, entries, hooks); + if (result != null) { + return result; + } + + // look in fragment entries + for (FragmentClasspath fragCP : getFragmentClasspaths()) { + result = findLocalClassImpl(classname, fragCP.getEntries(), hooks); + if (result != null) { + return result; } } + throw new ClassNotFoundException(classname); } + private Class findLocalClassImpl(String classname, ClasspathEntry[] cpEntries, List hooks) { + Class result; + for (ClasspathEntry cpEntry : cpEntries) { + if (cpEntry != null) { + result = findClassImpl(classname, cpEntry, hooks); + if (result != null) { + return result; + } + } + } + return null; + } + private Class findClassImpl(String name, ClasspathEntry classpathEntry, List hooks) { if (debug.DEBUG_LOADER) Debug.println("ModuleClassLoader[" + classloader.getBundleLoader() + " - " + classpathEntry.getBundleFile() + "].findClassImpl(" + name + ")"); //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ @@ -805,6 +876,17 @@ public class ClasspathManager { public Collection listLocalResources(String path, String filePattern, int options) { List bundleFiles = new ArrayList<>(); + // look for path first in hook specific entries if any + for (ClassLoaderHook hook : hookRegistry.getClassLoaderHooks()) { + ClasspathEntry[] hookEntries = hook.getClassPathEntries(path, this); + if (hookEntries != null) { + for (ClasspathEntry cpEntry : hookEntries) { + cpEntry.addBundleFiles(bundleFiles); + } + return Storage.listEntryPaths(bundleFiles, path, filePattern, options); + } + } + ClasspathEntry[] cpEntries = getHostClasspathEntries(); for (ClasspathEntry cpEntry : cpEntries) { cpEntry.addBundleFiles(bundleFiles); diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/FragmentClasspath.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/FragmentClasspath.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/FragmentClasspath.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/FragmentClasspath.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ManifestPackageAttributes.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ManifestPackageAttributes.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ManifestPackageAttributes.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ManifestPackageAttributes.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /****************************************************************************** * Copyright (c) 2016 Alex Blewitt and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Alex Blewitt - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/TitleVersionVendor.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/TitleVersionVendor.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/TitleVersionVendor.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/TitleVersionVendor.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /****************************************************************************** * Copyright (c) 2016 Alex Blewitt and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Alex Blewitt - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/EquinoxClassLoader.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/EquinoxClassLoader.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/EquinoxClassLoader.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/EquinoxClassLoader.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/FragmentLoader.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/FragmentLoader.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/FragmentLoader.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/FragmentLoader.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2014 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/ModuleClassLoader.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/ModuleClassLoader.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/ModuleClassLoader.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/ModuleClassLoader.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/FilteredSourcePackage.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/FilteredSourcePackage.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/FilteredSourcePackage.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/FilteredSourcePackage.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2014 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/MultiSourcePackage.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/MultiSourcePackage.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/MultiSourcePackage.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/MultiSourcePackage.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/NullPackageSource.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/NullPackageSource.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/NullPackageSource.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/NullPackageSource.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2014 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/PackageSource.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/PackageSource.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/PackageSource.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/PackageSource.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2014 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/SingleSourcePackage.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/SingleSourcePackage.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/SingleSourcePackage.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/SingleSourcePackage.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2014 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/SystemBundleLoader.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/SystemBundleLoader.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/SystemBundleLoader.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/SystemBundleLoader.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/BasicLocation.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/BasicLocation.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/BasicLocation.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/BasicLocation.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/Arguments.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/Arguments.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/Arguments.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/Arguments.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2016 IBM Corporation and others - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Eclipse Public License v1.0 which + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 which * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 ******************************************************************************/ package org.eclipse.osgi.internal.log; diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ConfigAdminListener.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ConfigAdminListener.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ConfigAdminListener.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ConfigAdminListener.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogFactory.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogFactory.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogFactory.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogFactory.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogServices.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogServices.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogServices.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogServices.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogWriter.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogWriter.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogWriter.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogWriter.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EventAdminAdapter.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EventAdminAdapter.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EventAdminAdapter.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EventAdminAdapter.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EventAdminLogListener.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EventAdminLogListener.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EventAdminLogListener.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EventAdminLogListener.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2016 IBM Corporation - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ package org.eclipse.osgi.internal.log; diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogEntryImpl.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogEntryImpl.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogEntryImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogEntryImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* - * Copyright (c) 2006, 2016 Cognos Incorporated, IBM Corporation and others - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Eclipse Public License v1.0 which + * Copyright (c) 2006, 2018 Cognos Incorporated, IBM Corporation and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 which * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 ******************************************************************************/ package org.eclipse.osgi.internal.log; @@ -26,6 +29,7 @@ public class ExtendedLogEntryImpl implem private final int level; private final LogLevel logLevelEnum; private final String message; + private final ServiceReference ref; private final Throwable throwable; private final Object contextObject; private final long time; @@ -55,7 +59,7 @@ public class ExtendedLogEntryImpl implem return threadId.longValue(); } - public ExtendedLogEntryImpl(Bundle bundle, String loggerName, StackTraceElement stackTraceElement, Object contextObject, LogLevel logLevelEnum, int level, String message, Throwable throwable) { + public ExtendedLogEntryImpl(Bundle bundle, String loggerName, StackTraceElement stackTraceElement, Object contextObject, LogLevel logLevelEnum, int level, String message, ServiceReference ref, Throwable throwable) { this.time = System.currentTimeMillis(); this.loggerName = loggerName; this.bundle = bundle; @@ -63,6 +67,7 @@ public class ExtendedLogEntryImpl implem this.logLevelEnum = logLevelEnum; this.message = message; this.throwable = throwable; + this.ref = ref; this.contextObject = contextObject; Thread currentThread = Thread.currentThread(); @@ -110,10 +115,7 @@ public class ExtendedLogEntryImpl implem } public ServiceReference getServiceReference() { - if (contextObject != null && contextObject instanceof ServiceReference) - return (ServiceReference) contextObject; - - return null; + return ref; } public long getTime() { diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogReaderServiceFactory.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogReaderServiceFactory.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogReaderServiceFactory.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogReaderServiceFactory.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* - * Copyright (c) 2006, 2017 Cognos Incorporated, IBM Corporation and others - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Eclipse Public License v1.0 which + * Copyright (c) 2006, 2018 Cognos Incorporated, IBM Corporation and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 which * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 ******************************************************************************/ package org.eclipse.osgi.internal.log; @@ -29,6 +32,7 @@ import org.eclipse.osgi.internal.framewo import org.eclipse.osgi.internal.log.OrderedExecutor.OrderedTaskQueue; import org.osgi.framework.Bundle; import org.osgi.framework.ServiceFactory; +import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; import org.osgi.service.log.LogEntry; import org.osgi.service.log.LogLevel; @@ -209,21 +213,21 @@ public class ExtendedLogReaderServiceFac return count; } - void log(final Bundle bundle, final String name, final StackTraceElement stackTraceElement, final Object context, final LogLevel logLevelEnum, final int level, final String message, final Throwable exception) { + void log(final Bundle bundle, final String name, final StackTraceElement stackTraceElement, final Object context, final LogLevel logLevelEnum, final int level, final String message, final ServiceReference ref, final Throwable exception) { if (System.getSecurityManager() != null) { AccessController.doPrivileged(new PrivilegedAction() { public Void run() { - logPrivileged(bundle, name, stackTraceElement, context, logLevelEnum, level, message, exception); + logPrivileged(bundle, name, stackTraceElement, context, logLevelEnum, level, message, ref, exception); return null; } }); } else { - logPrivileged(bundle, name, stackTraceElement, context, logLevelEnum, level, message, exception); + logPrivileged(bundle, name, stackTraceElement, context, logLevelEnum, level, message, ref, exception); } } - void logPrivileged(Bundle bundle, String name, StackTraceElement stackTraceElement, Object context, LogLevel logLevelEnum, int level, String message, Throwable exception) { - LogEntry logEntry = new ExtendedLogEntryImpl(bundle, name, stackTraceElement, context, logLevelEnum, level, message, exception); + void logPrivileged(Bundle bundle, String name, StackTraceElement stackTraceElement, Object context, LogLevel logLevelEnum, int level, String message, ServiceReference ref, Throwable exception) { + LogEntry logEntry = new ExtendedLogEntryImpl(bundle, name, stackTraceElement, context, logLevelEnum, level, message, ref, exception); storeEntry(logEntry); ArrayMap listenersCopy; listenersLock.readLock().lock(); diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogReaderServiceImpl.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogReaderServiceImpl.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogReaderServiceImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogReaderServiceImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2016 Cognos Incorporated, IBM Corporation and others - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Eclipse Public License v1.0 which + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 which * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 ******************************************************************************/ package org.eclipse.osgi.internal.log; diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogServiceFactory.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogServiceFactory.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogServiceFactory.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogServiceFactory.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,20 +1,30 @@ /******************************************************************************* - * Copyright (c) 2006, 2017 Cognos Incorporated, IBM Corporation and others - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Eclipse Public License v1.0 which + * Copyright (c) 2006, 2018 Cognos Incorporated, IBM Corporation and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 which * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 ******************************************************************************/ package org.eclipse.osgi.internal.log; import java.security.AccessController; import java.security.Permission; -import java.util.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; import java.util.concurrent.locks.ReentrantReadWriteLock; import org.eclipse.equinox.log.ExtendedLogService; import org.eclipse.equinox.log.LogPermission; import org.eclipse.osgi.framework.util.SecureAction; -import org.osgi.framework.*; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleEvent; +import org.osgi.framework.BundleListener; +import org.osgi.framework.ServiceFactory; +import org.osgi.framework.ServiceReference; +import org.osgi.framework.ServiceRegistration; import org.osgi.service.log.LogLevel; import org.osgi.service.log.Logger; import org.osgi.service.log.admin.LoggerAdmin; @@ -80,8 +90,8 @@ public class ExtendedLogServiceFactory i return logReaderServiceFactory.isLoggable(bundle, name, level); } - void log(Bundle bundle, String name, StackTraceElement stackTraceElement, Object context, LogLevel logLevelEnum, int level, String message, Throwable exception) { - logReaderServiceFactory.log(bundle, name, stackTraceElement, context, logLevelEnum, level, message, exception); + void log(Bundle bundle, String name, StackTraceElement stackTraceElement, Object context, LogLevel logLevelEnum, int level, String message, ServiceReference ref, Throwable exception) { + logReaderServiceFactory.log(bundle, name, stackTraceElement, context, logLevelEnum, level, message, ref, exception); } void checkLogPermission() throws SecurityException { diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogServiceImpl.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogServiceImpl.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogServiceImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogServiceImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2016 Cognos Incorporated, IBM Corporation and others - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Eclipse Public License v1.0 which + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 which * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 ******************************************************************************/ package org.eclipse.osgi.internal.log; diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/FormatterLoggerImpl.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/FormatterLoggerImpl.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/FormatterLoggerImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/FormatterLoggerImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2016 IBM Corporation and others - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Eclipse Public License v1.0 which + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 which * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 ******************************************************************************/ package org.eclipse.osgi.internal.log; diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/LoggerContextTargetMap.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/LoggerContextTargetMap.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/LoggerContextTargetMap.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/LoggerContextTargetMap.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/LoggerImpl.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/LoggerImpl.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/LoggerImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/LoggerImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* - * Copyright (c) 2006, 2012 Cognos Incorporated, IBM Corporation and others - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Eclipse Public License v1.0 which + * Copyright (c) 2006, 2018 Cognos Incorporated, IBM Corporation and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 which * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 ******************************************************************************/ package org.eclipse.osgi.internal.log; @@ -12,7 +15,9 @@ import java.util.regex.Pattern; import org.eclipse.equinox.log.Logger; import org.osgi.framework.Bundle; import org.osgi.framework.ServiceReference; -import org.osgi.service.log.*; +import org.osgi.service.log.LogLevel; +import org.osgi.service.log.LogService; +import org.osgi.service.log.LoggerConsumer; import org.osgi.service.log.admin.LoggerContext; public class LoggerImpl implements Logger { @@ -47,12 +52,12 @@ public class LoggerImpl implements Logge @SuppressWarnings("rawtypes") public void log(ServiceReference sr, int level, String message) { - log(sr, level, message, null); + log(sr, null, level, message, sr, null); } @SuppressWarnings("rawtypes") public void log(ServiceReference sr, int level, String message, Throwable exception) { - log(sr, null, level, message, exception); + log(sr, null, level, message, sr, exception); } public void log(Object context, int level, String message) { @@ -60,19 +65,19 @@ public class LoggerImpl implements Logge } public void log(Object context, int level, String message, Throwable exception) { - log(context, null, level, message, exception); + log(context, null, level, message, null, exception); } - private void log(Object context, LogLevel logLevelEnum, int level, String message, Throwable exception) { - log(logServiceImpl.getBundle(), context, logLevelEnum, level, message, exception); + private void log(Object context, LogLevel logLevelEnum, int level, String message, ServiceReference ref, Throwable exception) { + log(logServiceImpl.getBundle(), context, logLevelEnum, level, message, ref, exception); } - void log(Bundle entryBundle, Object context, LogLevel logLevelEnum, int level, String message, Throwable exception) { + void log(Bundle entryBundle, Object context, LogLevel logLevelEnum, int level, String message, ServiceReference ref, Throwable exception) { if (logLevelEnum == null) { logLevelEnum = getLogLevel(level); } if (enabledLevel.implies(logLevelEnum)) { - logServiceImpl.getFactory().log(entryBundle, name, getLocation(), context, logLevelEnum, level, message, exception); + logServiceImpl.getFactory().log(entryBundle, name, getLocation(), context, logLevelEnum, level, message, ref, exception); } } @@ -281,7 +286,7 @@ public class LoggerImpl implements Logge StackTraceElement location = getLocation(); Arguments processedArguments = new Arguments(arguments); String message = processedArguments.isEmpty() ? format : formatMessage(format, processedArguments); - logServiceImpl.getFactory().log(logServiceImpl.getBundle(), name, location, processedArguments.serviceReference(), level, level.ordinal(), message.toString(), processedArguments.throwable()); + logServiceImpl.getFactory().log(logServiceImpl.getBundle(), name, location, processedArguments.serviceReference(), level, level.ordinal(), message.toString(), processedArguments.serviceReference(), processedArguments.throwable()); } private StackTraceElement getLocation() { diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/LogServiceManager.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/LogServiceManager.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/LogServiceManager.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/LogServiceManager.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* - * Copyright (c) 2006, 2017 Cognos Incorporated, IBM Corporation and others - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Eclipse Public License v1.0 which + * Copyright (c) 2006, 2018 Cognos Incorporated, IBM Corporation and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 which * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 ******************************************************************************/ package org.eclipse.osgi.internal.log; @@ -25,7 +28,6 @@ import org.eclipse.osgi.internal.framewo import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleEvent; -import org.osgi.framework.BundleListener; import org.osgi.framework.Constants; import org.osgi.framework.FrameworkEvent; import org.osgi.framework.FrameworkListener; @@ -33,6 +35,7 @@ import org.osgi.framework.ServiceEvent; import org.osgi.framework.ServiceListener; import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; +import org.osgi.framework.SynchronousBundleListener; import org.osgi.framework.Version; import org.osgi.service.log.LogLevel; import org.osgi.service.log.LogListener; @@ -41,7 +44,7 @@ import org.osgi.service.log.LogService; import org.osgi.service.log.LoggerFactory; import org.osgi.service.log.admin.LoggerAdmin; -public class LogServiceManager implements BundleListener, FrameworkListener, ServiceListener { +public class LogServiceManager implements SynchronousBundleListener, FrameworkListener, ServiceListener { private static final String LOGGER_FRAMEWORK_EVENT = "Events.Framework"; //$NON-NLS-1$ private static final String LOGGER_BUNDLE_EVENT = "Events.Bundle"; //$NON-NLS-1$ private static final String LOGGER_SERVICE_EVENT = "Events.Service"; //$NON-NLS-1$ @@ -127,7 +130,7 @@ public class LogServiceManager implement Bundle bundle = event.getBundle(); if (logReaderServiceFactory.isLoggable(bundle, LOGGER_BUNDLE_EVENT, LogService.LOG_INFO)) { LoggerImpl logger = (LoggerImpl) systemBundleLog.getLogger(LOGGER_BUNDLE_EVENT); - logger.log(bundle, null, null, LogService.LOG_INFO, getBundleEventTypeName(event.getType()), null); + logger.log(bundle, event, null, LogService.LOG_INFO, getBundleEventTypeName(event.getType()), null, null); } } @@ -143,7 +146,7 @@ public class LogServiceManager implement int logType = (eventType == ServiceEvent.MODIFIED) ? LogService.LOG_DEBUG : LogService.LOG_INFO; if (logReaderServiceFactory.isLoggable(bundle, LOGGER_SERVICE_EVENT, logType)) { LoggerImpl logger = (LoggerImpl) systemBundleLog.getLogger(LOGGER_SERVICE_EVENT); - logger.log(bundle, reference, null, logType, getServiceEventTypeName(eventType), null); + logger.log(bundle, event, null, logType, getServiceEventTypeName(eventType), reference, null); } } @@ -151,10 +154,10 @@ public class LogServiceManager implement * FrameworkListener.frameworkEvent method. * */ + @SuppressWarnings("deprecation") public void frameworkEvent(FrameworkEvent event) { Bundle bundle = event.getBundle(); int eventType = event.getType(); - @SuppressWarnings("deprecation") int logType; switch (eventType) { case FrameworkEvent.ERROR : @@ -170,7 +173,7 @@ public class LogServiceManager implement if (logReaderServiceFactory.isLoggable(bundle, LOGGER_FRAMEWORK_EVENT, logType)) { LoggerImpl logger = (LoggerImpl) systemBundleLog.getLogger(LOGGER_FRAMEWORK_EVENT); - logger.log(bundle, null, null, logType, getFrameworkEventTypeName(eventType), event.getThrowable()); + logger.log(bundle, event, null, logType, getFrameworkEventTypeName(eventType), null, event.getThrowable()); } } diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/BundlePermissions.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/BundlePermissions.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/BundlePermissions.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/BundlePermissions.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/EquinoxSecurityManager.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/EquinoxSecurityManager.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/EquinoxSecurityManager.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/EquinoxSecurityManager.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/EvaluationCacheKey.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/EvaluationCacheKey.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/EvaluationCacheKey.java 1970-01-01 00:00:00.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/EvaluationCacheKey.java 2018-08-27 15:36:00.000000000 +0000 @@ -0,0 +1,46 @@ +/******************************************************************************* + * Copyright (c) 2018 Connexta, LLC and others. + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Connexta, LLC - initial implementation + *******************************************************************************/ +package org.eclipse.osgi.internal.permadmin; + +import java.security.Permission; +import java.util.Objects; + +class EvaluationCacheKey { + + private final Permission permission; + + private final BundlePermissions bundlePermissions; + + EvaluationCacheKey(BundlePermissions bundlePermissions, Permission permission) { + this.permission = permission; + this.bundlePermissions = bundlePermissions; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + EvaluationCacheKey that = (EvaluationCacheKey) o; + return bundlePermissions == that.bundlePermissions && Objects.equals(permission, that.permission); + } + + @Override + public int hashCode() { + return Objects.hash(bundlePermissions, permission); + } +} diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/implied.permissions 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/implied.permissions --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/implied.permissions 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/implied.permissions 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ######################################################################## # Copyright (c) 2003, 2010 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/PermissionAdminTable.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/PermissionAdminTable.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/PermissionAdminTable.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/PermissionAdminTable.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/PermissionInfoCollection.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/PermissionInfoCollection.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/PermissionInfoCollection.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/PermissionInfoCollection.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/PermissionsHash.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/PermissionsHash.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/PermissionsHash.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/PermissionsHash.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityAdmin.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityAdmin.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityAdmin.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityAdmin.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,26 +1,66 @@ /******************************************************************************* * Copyright (c) 2008, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.osgi.internal.permadmin; -import java.io.*; +import java.io.BufferedReader; +import java.io.DataInputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import java.math.BigInteger; import java.net.URL; import java.nio.charset.StandardCharsets; -import java.security.*; -import java.security.cert.*; -import java.util.*; +import java.security.AccessControlContext; +import java.security.AllPermission; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.Permission; +import java.security.PermissionCollection; +import java.security.Principal; +import java.security.ProtectionDomain; +import java.security.PublicKey; +import java.security.SignatureException; +import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateException; +import java.security.cert.CertificateExpiredException; +import java.security.cert.X509Certificate; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.Dictionary; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; import org.eclipse.osgi.internal.framework.EquinoxBundle; import org.eclipse.osgi.storage.PermissionData; -import org.osgi.framework.*; -import org.osgi.service.condpermadmin.*; +import org.osgi.framework.AdminPermission; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleException; +import org.osgi.framework.ServiceReference; +import org.osgi.framework.Version; +import org.osgi.service.condpermadmin.ConditionInfo; +import org.osgi.service.condpermadmin.ConditionalPermissionAdmin; +import org.osgi.service.condpermadmin.ConditionalPermissionInfo; +import org.osgi.service.condpermadmin.ConditionalPermissionUpdate; import org.osgi.service.permissionadmin.PermissionAdmin; import org.osgi.service.permissionadmin.PermissionInfo; @@ -405,6 +445,7 @@ public final class SecurityAdmin impleme permAdminCollections[i].clearPermissionCache(); for (int i = 0; i < condAdminRows.length; i++) condAdminRows[i].clearCaches(); + condAdminTable.clearEvaluationCache(); } EquinoxSecurityManager getSupportedSecurityManager() { diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityRow.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityRow.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityRow.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityRow.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,20 +1,32 @@ /******************************************************************************* * Copyright (c) 2008, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation + * Connexta, LLC - performance improvements *******************************************************************************/ package org.eclipse.osgi.internal.permadmin; -import java.lang.reflect.*; +import java.lang.reflect.Array; +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; import java.security.Permission; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.osgi.framework.Bundle; -import org.osgi.service.condpermadmin.*; +import org.osgi.service.condpermadmin.Condition; +import org.osgi.service.condpermadmin.ConditionInfo; +import org.osgi.service.condpermadmin.ConditionalPermissionInfo; import org.osgi.service.permissionadmin.PermissionInfo; public final class SecurityRow implements ConditionalPermissionInfo { @@ -33,6 +45,7 @@ public final class SecurityRow implement private final boolean deny; /* GuardedBy(bundleConditions) */ final Map bundleConditions; + final Object bundleConditionsLock = new Object(); public SecurityRow(SecurityAdmin securityAdmin, String name, ConditionInfo[] conditionInfos, PermissionInfo[] permissionInfos, String decision) { if (permissionInfos == null || permissionInfos.length == 0) @@ -237,62 +250,92 @@ public final class SecurityRow implement securityAdmin.delete(this, true); } - Condition[] getConditions(Bundle bundle) { - Condition[] conditions = new Condition[conditionInfos.length]; - for (int i = 0; i < conditionInfos.length; i++) { - /* - * TODO: Can we pre-get the Constructors in our own constructor - */ - Class clazz; - try { - clazz = Class.forName(conditionInfos[i].getType()); - } catch (ClassNotFoundException e) { - /* If the class isn't there, we fail */ - return null; - } - Constructor constructor = null; - Method method = null; - try { - method = clazz.getMethod("getCondition", conditionMethodArgs); //$NON-NLS-1$ - if ((method.getModifiers() & Modifier.STATIC) == 0) - method = null; - } catch (NoSuchMethodException e) { - // This is a normal case - } - if (method == null) - try { - constructor = clazz.getConstructor(conditionMethodArgs); - } catch (NoSuchMethodException e) { - // TODO should post a FrameworkEvent of type error here - conditions[i] = Condition.FALSE; - continue; + Condition[] getConditions(BundlePermissions bundlePermissions) { + synchronized (bundleConditionsLock) { + Condition[] conditions = null; + if (bundleConditions != null) { + conditions = bundleConditions.get(bundlePermissions); + } + if (conditions == null) { + conditions = new Condition[conditionInfos.length]; + for (int i = 0; i < conditionInfos.length; i++) { + /* + * TODO: Can we pre-get the Constructors in our own constructor + */ + Class clazz; + try { + clazz = Class.forName(conditionInfos[i].getType()); + } catch (ClassNotFoundException e) { + /* If the class isn't there, we fail */ + return null; + } + Constructor constructor = null; + Method method = getConditionMethod(clazz); + if (method == null) { + constructor = getConditionConstructor(clazz); + if (constructor == null) { + // TODO should post a FrameworkEvent of type error here + conditions[i] = Condition.FALSE; + continue; + } + } + + Object[] args = {bundlePermissions.getBundle(), conditionInfos[i]}; + try { + if (method != null) + conditions[i] = (Condition) method.invoke(null, args); + else + conditions[i] = (Condition) constructor.newInstance(args); + } catch (Exception e) { + // TODO should post a FrameworkEvent of type error here + conditions[i] = Condition.FALSE; + } } + if (bundleConditions != null) { + bundleConditions.put(bundlePermissions, conditions); + } + } + return conditions; + } + } - Object args[] = {bundle, conditionInfos[i]}; - try { - if (method != null) - conditions[i] = (Condition) method.invoke(null, args); - else - conditions[i] = (Condition) constructor.newInstance(args); - } catch (Throwable t) { - // TODO should post a FrameworkEvent of type error here - conditions[i] = Condition.FALSE; + private Method getConditionMethod(Class clazz) { + for (Method checkMethod : clazz.getMethods()) { + if (checkMethod.getName().equals("getCondition") //$NON-NLS-1$ + && (checkMethod.getModifiers() & Modifier.STATIC) == Modifier.STATIC // + && checkParameterTypes(checkMethod.getParameterTypes())) { + return checkMethod; } } - return conditions; + return null; + } + + private Constructor getConditionConstructor(Class clazz) { + for (Constructor checkConstructor : clazz.getConstructors()) { + if (checkParameterTypes(checkConstructor.getParameterTypes())) { + return checkConstructor; + } + } + return null; + } + + private boolean checkParameterTypes(Class[] foundTypes) { + if (foundTypes.length != conditionMethodArgs.length) { + return false; + } + + for (int i = 0; i < foundTypes.length; i++) { + if (!foundTypes[i].isAssignableFrom(conditionMethodArgs[i])) { + return false; + } + } + return true; } Decision evaluate(BundlePermissions bundlePermissions, Permission permission) { if (bundleConditions == null || bundlePermissions == null) return evaluatePermission(permission); - Condition[] conditions; - synchronized (bundleConditions) { - conditions = bundleConditions.get(bundlePermissions); - if (conditions == null) { - conditions = getConditions(bundlePermissions.getBundle()); - bundleConditions.put(bundlePermissions, conditions); - } - } + Condition[] conditions = getConditions(bundlePermissions); if (conditions == ABSTAIN_LIST) return DECISION_ABSTAIN; if (conditions == SATISFIED_LIST) @@ -314,7 +357,7 @@ public final class SecurityRow implement } else { if (!mutable) // this will cause the row to always abstain; mark this to be ignored in future checks - synchronized (bundleConditions) { + synchronized (bundleConditionsLock) { bundleConditions.put(bundlePermissions, ABSTAIN_LIST); } return DECISION_ABSTAIN; @@ -333,7 +376,7 @@ public final class SecurityRow implement empty &= conditions[i] == null; } if (empty) { - synchronized (bundleConditions) { + synchronized (bundleConditionsLock) { bundleConditions.put(bundlePermissions, SATISFIED_LIST); } } @@ -413,7 +456,7 @@ public final class SecurityRow implement void clearCaches() { permissionInfoCollection.clearPermissionCache(); if (bundleConditions != null) - synchronized (bundleConditions) { + synchronized (bundleConditionsLock) { bundleConditions.clear(); } } @@ -435,7 +478,7 @@ public final class SecurityRow implement if (mutable || !condition.isPostponed()) return; // do nothing if (isSatisfied) { - synchronized (row.bundleConditions) { + synchronized (row.bundleConditionsLock) { Condition[] rowConditions = row.bundleConditions.get(bundlePermissions); boolean isEmpty = true; for (int i = 0; i < rowConditions.length; i++) { @@ -448,7 +491,7 @@ public final class SecurityRow implement row.bundleConditions.put(bundlePermissions, SATISFIED_LIST); } } else { - synchronized (row.bundleConditions) { + synchronized (row.bundleConditionsLock) { row.bundleConditions.put(bundlePermissions, ABSTAIN_LIST); } } diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityRowSnapShot.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityRowSnapShot.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityRowSnapShot.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityRowSnapShot.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityTable.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityTable.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityTable.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityTable.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,19 +1,26 @@ /******************************************************************************* * Copyright (c) 2008, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation + * Connexta, LLC - evaluation cache implementation *******************************************************************************/ package org.eclipse.osgi.internal.permadmin; import java.security.Permission; import java.security.PermissionCollection; import java.util.Enumeration; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import org.eclipse.osgi.internal.permadmin.SecurityRow.Decision; +import org.osgi.service.condpermadmin.Condition; public class SecurityTable extends PermissionCollection { private static final long serialVersionUID = -1800193310096318060L; @@ -22,9 +29,13 @@ public class SecurityTable extends Permi static final int ABSTAIN = 0x0004; static final int POSTPONED = 0x0008; + private static final int MUTABLE = 0x0016; + private final SecurityRow[] rows; private final SecurityAdmin securityAdmin; + private final transient Map evaluationCache = new ConcurrentHashMap<>(10000); + public SecurityTable(SecurityAdmin securityAdmin, SecurityRow[] rows) { if (rows == null) throw new NullPointerException("rows cannot be null!!"); //$NON-NLS-1$ @@ -37,63 +48,121 @@ public class SecurityTable extends Permi } int evaluate(BundlePermissions bundlePermissions, Permission permission) { - if (isEmpty()) + if (bundlePermissions == null) { + return ABSTAIN; + } + EvaluationCacheKey evaluationCacheKey = new EvaluationCacheKey(bundlePermissions, permission); + if (isEmpty()) { + evaluationCache.put(evaluationCacheKey, ABSTAIN); return ABSTAIN; + } + + //can't short-circuit early, so try cache + Integer result = evaluationCache.get(evaluationCacheKey); + boolean hasMutable = false; + if (result != null) { + hasMutable = (result & MUTABLE) == MUTABLE; + if (!hasMutable) { + return result; + } + } + //cache miss or has mutable rows boolean postponed = false; Decision[] results = new Decision[rows.length]; int immediateDecisionIdx = -1; // evaluate each row - for (int i = 0; i < rows.length; i++) { + for (int i = 0; i < rows.length && immediateDecisionIdx == -1; i++) { + if (result == null) { + //check all conditions for any that are mutable, this will turn off the cache + hasMutable |= checkMutable(bundlePermissions, evaluationCacheKey, rows[i]); + } try { results[i] = rows[i].evaluate(bundlePermissions, permission); - } catch (Throwable t) { + } catch (Exception e) { // TODO log? results[i] = SecurityRow.DECISION_ABSTAIN; } - if ((results[i].decision & ABSTAIN) != 0) + if ((results[i].decision & ABSTAIN) == ABSTAIN) continue; // ignore this row and continue to next row - if ((results[i].decision & POSTPONED) != 0) { + if ((results[i].decision & POSTPONED) == POSTPONED) { // row is postponed; we can no longer return quickly on a denied decision postponed = true; continue; // continue to next row } - if (!postponed) + if (!postponed) { // no postpones encountered yet; we can return the decision quickly + if (!hasMutable) { + evaluationCache.put(evaluationCacheKey, results[i].decision); + } return results[i].decision; // return GRANTED or DENIED + } // got an immediate answer; but it is after a postponed condition. // no need to process the rest of the rows immediateDecisionIdx = i; - break; } + Integer immediateDecision = handlePostponedConditions(evaluationCacheKey, hasMutable, postponed, results, immediateDecisionIdx); + if (immediateDecision != null) + return immediateDecision; + int finalDecision = postponed ? POSTPONED : ABSTAIN; + if (!hasMutable && (finalDecision & POSTPONED) != POSTPONED) { + evaluationCache.put(evaluationCacheKey, finalDecision); + } + return finalDecision; + } + + private boolean checkMutable(BundlePermissions bundlePermissions, EvaluationCacheKey evaluationCacheKey, SecurityRow row) { + Condition[] conditions = row.getConditions(bundlePermissions); + if (conditions != null) { + for (Condition condition : conditions) { + if (condition != null && condition.isMutable()) { + evaluationCache.put(evaluationCacheKey, MUTABLE); + return true; + } + } + } + return false; + } + + private Integer handlePostponedConditions(EvaluationCacheKey evaluationCacheKey, boolean hasMutable, boolean postponed, Decision[] results, int immediateDecisionIdx) { if (postponed) { int immediateDecision = immediateDecisionIdx < 0 ? DENIED : results[immediateDecisionIdx].decision; - // iterate over all postponed conditions; + // iterate over all postponed conditions; // if they all provide the same decision as the immediate decision then return the immediate decision boolean allSameDecision = true; int i = immediateDecisionIdx < 0 ? results.length - 1 : immediateDecisionIdx - 1; for (; i >= 0 && allSameDecision; i--) { - if (results[i] == null) - continue; - if ((results[i].decision & POSTPONED) != 0) { + if ((results[i].decision & POSTPONED) == POSTPONED) { if ((results[i].decision & immediateDecision) == 0) allSameDecision = false; else results[i] = SecurityRow.DECISION_ABSTAIN; // we can clear postpones with the same decision as the immediate } } - if (allSameDecision) + if (allSameDecision) { + if (!hasMutable) { + evaluationCache.put(evaluationCacheKey, immediateDecision); + } return immediateDecision; + } - // we now are forced to postpone; we need to also remember the postponed decisions and + // we now are forced to postpone; we need to also remember the postponed decisions and // the immediate decision if there is one. EquinoxSecurityManager equinoxManager = securityAdmin.getSupportedSecurityManager(); - if (equinoxManager == null) + if (equinoxManager == null) { // TODO this is really an error condition. // This should never happen. We checked for a supported manager when the row was postponed + if (!hasMutable) { + evaluationCache.put(evaluationCacheKey, ABSTAIN); + } return ABSTAIN; + } equinoxManager.addConditionsForDomain(results); } - return postponed ? POSTPONED : ABSTAIN; + return null; + } + + void clearEvaluationCache() { + evaluationCache.clear(); } SecurityRow getRow(int i) { diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityTableUpdate.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityTableUpdate.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityTableUpdate.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityTableUpdate.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationEngine.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationEngine.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationEngine.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationEngine.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationEvent.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationEvent.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationEvent.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationEvent.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationListener.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationListener.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationListener.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationListener.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationStatus.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationStatus.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationStatus.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationStatus.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateChain.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateChain.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateChain.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateChain.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateTrustAuthority.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateTrustAuthority.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateTrustAuthority.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateTrustAuthority.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifierFactory.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifierFactory.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifierFactory.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifierFactory.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifier.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifier.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifier.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifier.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/service/security/KeyStoreTrustEngine.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/service/security/KeyStoreTrustEngine.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/service/security/KeyStoreTrustEngine.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/service/security/KeyStoreTrustEngine.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/FilteredServiceListener.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/FilteredServiceListener.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/FilteredServiceListener.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/FilteredServiceListener.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/HookContext.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/HookContext.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/HookContext.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/HookContext.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ModifiedServiceEvent.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ModifiedServiceEvent.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ModifiedServiceEvent.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ModifiedServiceEvent.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/PrototypeServiceFactoryUse.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/PrototypeServiceFactoryUse.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/PrototypeServiceFactoryUse.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/PrototypeServiceFactoryUse.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceConsumer.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceConsumer.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceConsumer.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceConsumer.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceFactoryUse.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceFactoryUse.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceFactoryUse.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceFactoryUse.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceObjectsImpl.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceObjectsImpl.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceObjectsImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceObjectsImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceProperties.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceProperties.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceProperties.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceProperties.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceReferenceImpl.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceReferenceImpl.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceReferenceImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceReferenceImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceRegistrationImpl.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceRegistrationImpl.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceRegistrationImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceRegistrationImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceRegistry.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceRegistry.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceRegistry.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceRegistry.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceUse.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceUse.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceUse.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceUse.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ShrinkableCollection.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ShrinkableCollection.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ShrinkableCollection.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ShrinkableCollection.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ShrinkableEntrySetValueCollection.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ShrinkableEntrySetValueCollection.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ShrinkableEntrySetValueCollection.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ShrinkableEntrySetValueCollection.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ShrinkableValueCollectionMap.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ShrinkableValueCollectionMap.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ShrinkableValueCollectionMap.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ShrinkableValueCollectionMap.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/Base64.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/Base64.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/Base64.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/Base64.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/BERProcessor.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/BERProcessor.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/BERProcessor.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/BERProcessor.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2014 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/DigestedInputStream.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/DigestedInputStream.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/DigestedInputStream.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/DigestedInputStream.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/PKCS7DateParser.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/PKCS7DateParser.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/PKCS7DateParser.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/PKCS7DateParser.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,8 +1,12 @@ /******************************************************************************* - * Copyright (c) 2006, 2012 IBM Corporation and others. All rights reserved. + * Copyright (c) 2006, 2012 IBM Corporation and others. + * * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html + * terms of the Eclipse Public License 2.0 which accompanies this distribution, + * and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/PKCS7Processor.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/PKCS7Processor.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/PKCS7Processor.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/PKCS7Processor.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,8 +1,12 @@ /******************************************************************************* - * Copyright (c) 2006, 2016 IBM Corporation and others. All rights reserved. + * Copyright (c) 2006, 2016 IBM Corporation and others. + * * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html + * terms of the Eclipse Public License 2.0 which accompanies this distribution, + * and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignatureBlockProcessor.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignatureBlockProcessor.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignatureBlockProcessor.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignatureBlockProcessor.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,8 +1,12 @@ /******************************************************************************* - * Copyright (c) 2007, 2016 IBM Corporation and others. All rights reserved. + * Copyright (c) 2007, 2016 IBM Corporation and others. + * * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html + * terms of the Eclipse Public License 2.0 which accompanies this distribution, + * and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedBundleFile.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedBundleFile.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedBundleFile.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedBundleFile.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedBundleHook.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedBundleHook.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedBundleHook.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedBundleHook.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentConstants.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentConstants.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentConstants.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentConstants.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,8 +1,12 @@ /******************************************************************************* - * Copyright (c) 2006, 2014 IBM Corporation and others. All rights reserved. + * Copyright (c) 2006, 2014 IBM Corporation and others. + * * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html + * terms of the Eclipse Public License 2.0 which accompanies this distribution, + * and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentFile.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentFile.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentFile.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentFile.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentImpl.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentImpl.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,8 +1,12 @@ /******************************************************************************* - * Copyright (c) 2007, 2016 IBM Corporation and others. All rights reserved. + * Copyright (c) 2007, 2016 IBM Corporation and others. + * * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html + * terms of the Eclipse Public License 2.0 which accompanies this distribution, + * and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentMessages.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentMessages.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentMessages.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentMessages.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentMessages.properties 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentMessages.properties --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentMessages.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentMessages.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2006, 2012 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedStorageHook.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedStorageHook.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedStorageHook.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedStorageHook.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,8 +1,12 @@ /******************************************************************************* - * Copyright (c) 2006, 2016 IBM Corporation and others. All rights reserved. + * Copyright (c) 2006, 2016 IBM Corporation and others. + * * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html + * terms of the Eclipse Public License 2.0 which accompanies this distribution, + * and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignerInfoImpl.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignerInfoImpl.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignerInfoImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignerInfoImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,8 +1,12 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 IBM Corporation and others. All rights reserved. + * Copyright (c) 2007, 2012 IBM Corporation and others. + * * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html + * terms of the Eclipse Public License 2.0 which accompanies this distribution, + * and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/TrustEngineListener.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/TrustEngineListener.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/TrustEngineListener.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/TrustEngineListener.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,8 +1,12 @@ /******************************************************************************* - * Copyright (c) 2007, 2016 IBM Corporation and others. All rights reserved. + * Copyright (c) 2007, 2016 IBM Corporation and others. + * * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html + * terms of the Eclipse Public License 2.0 which accompanies this distribution, + * and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/ContentHandlerFactoryImpl.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/ContentHandlerFactoryImpl.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/ContentHandlerFactoryImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/ContentHandlerFactoryImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2018 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/ContentHandlerProxy.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/ContentHandlerProxy.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/ContentHandlerProxy.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/ContentHandlerProxy.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/EquinoxFactoryManager.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/EquinoxFactoryManager.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/EquinoxFactoryManager.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/EquinoxFactoryManager.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingContentHandler.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingContentHandler.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingContentHandler.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingContentHandler.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2012 Cognos Incorporated, IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * *******************************************************************************/ package org.eclipse.osgi.internal.url; diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingFactory.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingFactory.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingFactory.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingFactory.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2016 Cognos Incorporated, IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * *******************************************************************************/ package org.eclipse.osgi.internal.url; diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingURLStreamHandler.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingURLStreamHandler.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingURLStreamHandler.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingURLStreamHandler.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2016 Cognos Incorporated, IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * *******************************************************************************/ package org.eclipse.osgi.internal.url; diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/NullURLStreamHandlerService.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/NullURLStreamHandlerService.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/NullURLStreamHandlerService.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/NullURLStreamHandlerService.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/SetAccessible.java.src 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/SetAccessible.java.src --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/SetAccessible.java.src 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/SetAccessible.java.src 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * *******************************************************************************/ package java.net; diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerFactoryImpl.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerFactoryImpl.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerFactoryImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerFactoryImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerProxy.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerProxy.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerProxy.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerProxy.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerSetter.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerSetter.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerSetter.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerSetter.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/weaving/DynamicImportList.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/weaving/DynamicImportList.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/weaving/DynamicImportList.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/weaving/DynamicImportList.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/weaving/WeavingHookConfigurator.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/weaving/WeavingHookConfigurator.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/weaving/WeavingHookConfigurator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/weaving/WeavingHookConfigurator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/weaving/WovenClassImpl.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/weaving/WovenClassImpl.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/weaving/WovenClassImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/weaving/WovenClassImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/launch/EquinoxFactory.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/launch/EquinoxFactory.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/launch/EquinoxFactory.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/launch/EquinoxFactory.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/launch/Equinox.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/launch/Equinox.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/launch/Equinox.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/launch/Equinox.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/pluginconversion/PluginConversionException.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/pluginconversion/PluginConversionException.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/pluginconversion/PluginConversionException.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/pluginconversion/PluginConversionException.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/pluginconversion/PluginConverter.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/pluginconversion/PluginConverter.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/pluginconversion/PluginConverter.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/pluginconversion/PluginConverter.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BaseDescription.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BaseDescription.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BaseDescription.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BaseDescription.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BundleDelta.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BundleDelta.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BundleDelta.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BundleDelta.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BundleDescription.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BundleDescription.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BundleDescription.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BundleDescription.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BundleSpecification.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BundleSpecification.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BundleSpecification.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BundleSpecification.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/DisabledInfo.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/DisabledInfo.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/DisabledInfo.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/DisabledInfo.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/ExportPackageDescription.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/ExportPackageDescription.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/ExportPackageDescription.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/ExportPackageDescription.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/GenericDescription.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/GenericDescription.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/GenericDescription.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/GenericDescription.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/GenericSpecification.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/GenericSpecification.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/GenericSpecification.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/GenericSpecification.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/HostSpecification.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/HostSpecification.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/HostSpecification.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/HostSpecification.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/ImportPackageSpecification.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/ImportPackageSpecification.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/ImportPackageSpecification.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/ImportPackageSpecification.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/NativeCodeDescription.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/NativeCodeDescription.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/NativeCodeDescription.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/NativeCodeDescription.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/NativeCodeSpecification.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/NativeCodeSpecification.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/NativeCodeSpecification.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/NativeCodeSpecification.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/PlatformAdmin.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/PlatformAdmin.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/PlatformAdmin.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/PlatformAdmin.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/ResolverError.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/ResolverError.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/ResolverError.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/ResolverError.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/ResolverHookException.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/ResolverHookException.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/ResolverHookException.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/ResolverHookException.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2011, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/Resolver.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/Resolver.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/Resolver.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/Resolver.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateDelta.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateDelta.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateDelta.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateDelta.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateHelper.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateHelper.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateHelper.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateHelper.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/State.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/State.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/State.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/State.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateObjectFactory.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateObjectFactory.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateObjectFactory.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateObjectFactory.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateWire.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateWire.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateWire.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateWire.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2011, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/VersionConstraint.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/VersionConstraint.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/VersionConstraint.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/VersionConstraint.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/VersionRange.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/VersionRange.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/VersionRange.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/VersionRange.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/security/TrustEngine.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/security/TrustEngine.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/security/TrustEngine.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/security/TrustEngine.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/InvalidContentException.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/InvalidContentException.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/InvalidContentException.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/InvalidContentException.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignedContentEntry.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignedContentEntry.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignedContentEntry.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignedContentEntry.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignedContentFactory.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignedContentFactory.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignedContentFactory.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignedContentFactory.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignedContent.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignedContent.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignedContent.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignedContent.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignerInfo.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignerInfo.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignerInfo.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignerInfo.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/BundleEntry.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/BundleEntry.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/BundleEntry.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/BundleEntry.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/BundleFile.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/BundleFile.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/BundleFile.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/BundleFile.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2015 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/BundleFileWrapperChain.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/BundleFileWrapperChain.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/BundleFileWrapperChain.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/BundleFileWrapperChain.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/BundleFileWrapper.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/BundleFileWrapper.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/BundleFileWrapper.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/BundleFileWrapper.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2015 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/DirBundleFile.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/DirBundleFile.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/DirBundleFile.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/DirBundleFile.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/DirZipBundleEntry.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/DirZipBundleEntry.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/DirZipBundleEntry.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/DirZipBundleEntry.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/FileBundleEntry.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/FileBundleEntry.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/FileBundleEntry.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/FileBundleEntry.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/MRUBundleFileList.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/MRUBundleFileList.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/MRUBundleFileList.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/MRUBundleFileList.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2018 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/NestedDirBundleFile.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/NestedDirBundleFile.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/NestedDirBundleFile.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/NestedDirBundleFile.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* - * Copyright (c) 2005, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * Copyright (c) 2005, 2018 IBM Corporation and others. + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -138,4 +141,10 @@ public class NestedDirBundleFile extends public void open() throws IOException { // do nothing } + + @Override + public String toString() { + return super.toString() + '[' + nestedDirName + ']'; + } + } diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/ZipBundleEntry.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/ZipBundleEntry.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/ZipBundleEntry.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/ZipBundleEntry.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2018 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/ZipBundleFile.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/ZipBundleFile.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/ZipBundleFile.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/ZipBundleFile.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2018 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -31,6 +34,7 @@ import org.eclipse.osgi.internal.debug.D import org.eclipse.osgi.internal.framework.EquinoxContainer; import org.eclipse.osgi.internal.messages.Msg; import org.eclipse.osgi.storage.BundleInfo; +import org.eclipse.osgi.storage.Storage.StorageException; import org.eclipse.osgi.util.NLS; /** @@ -190,13 +194,7 @@ public class ZipBundleFile extends Bundl private File getExtractFile(String entryName) { if (generation == null) return null; - String path = ".cp"; /* put all these entries in this subdir *///$NON-NLS-1$ - String name = entryName.replace('/', File.separatorChar); - if ((name.length() > 1) && (name.charAt(0) == File.separatorChar)) /* if name has a leading slash */ - path = path.concat(name); - else - path = path + File.separator + name; - return generation.getExtractFile(path); + return generation.getExtractFile(".cp", entryName); //$NON-NLS-1$ } public File getFile(String entry, boolean nativeCode) { @@ -241,6 +239,10 @@ public class ZipBundleFile extends Bundl if (debug.DEBUG_BUNDLE_FILE) Debug.printStackTrace(e); generation.getBundleInfo().getStorage().getLogServices().log(EquinoxContainer.NAME, FrameworkLogEntry.ERROR, "Unable to extract content: " + generation.getRevision() + ": " + entry, e); //$NON-NLS-1$ //$NON-NLS-2$ + } catch (StorageException e) { + if (debug.DEBUG_BUNDLE_FILE) + Debug.printStackTrace(e); + generation.getBundleInfo().getStorage().getLogServices().log(EquinoxContainer.NAME, FrameworkLogEntry.ERROR, "Unable to extract content: " + generation.getRevision() + ": " + entry, e); //$NON-NLS-1$ //$NON-NLS-2$ } } finally { openLock.unlock(); diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/BundleInfo.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/BundleInfo.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/BundleInfo.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/BundleInfo.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* - * Copyright (c) 2012, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * Copyright (c) 2012, 2018 IBM Corporation and others. + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -41,6 +44,7 @@ import org.eclipse.osgi.internal.framewo import org.eclipse.osgi.internal.hookregistry.StorageHookFactory; import org.eclipse.osgi.internal.hookregistry.StorageHookFactory.StorageHook; import org.eclipse.osgi.internal.messages.Msg; +import org.eclipse.osgi.storage.Storage.StorageException; import org.eclipse.osgi.storage.bundlefile.BundleEntry; import org.eclipse.osgi.storage.bundlefile.BundleFile; import org.eclipse.osgi.storage.url.BundleResourceHandler; @@ -308,15 +312,31 @@ public final class BundleInfo { * not exist if the content has not previously been stored. * @param path the path to the content to extract from the generation * @return a file object where content of the specified path may be stored. + * @throws StorageException if the path will escape the persistent storage of the generation */ public File getExtractFile(String path) { - StringBuilder builder = new StringBuilder(); - builder.append(getBundleId()).append('/').append(getGenerationId()); - if (path.length() > 0 && path.charAt(0) != '/') { - builder.append('/'); + return getExtractFile(null, path); + } + + /** + * Gets called by BundleFile during {@link BundleFile#getFile(String, boolean)}. This method + * will allocate a File object where content of the specified path may be + * stored for this generation. The returned File object may + * not exist if the content has not previously been stored. + * @param path the path to the content to extract from the generation + * @param base the base path that is prepended to the path, may be null + * @return a file object where content of the specified path may be stored. + * @throws StorageException if the path will escape the persistent storage of + * the generation starting at the specified base + */ + public File getExtractFile(String base, String path) { + StringBuilder baseBuilder = new StringBuilder(); + baseBuilder.append(getBundleId()).append('/').append(getGenerationId()); + if (base != null) { + baseBuilder.append('/').append(base); } - builder.append(path); - return getStorage().getFile(builder.toString(), true); + + return getStorage().getFile(baseBuilder.toString(), path, true); } public void storeContent(File destination, InputStream in, boolean nativeCode) throws IOException { diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/BundleLocalizationImpl.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/BundleLocalizationImpl.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/BundleLocalizationImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/BundleLocalizationImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/FrameworkExtensionInstaller.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/FrameworkExtensionInstaller.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/FrameworkExtensionInstaller.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/FrameworkExtensionInstaller.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/ManifestLocalization.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/ManifestLocalization.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/ManifestLocalization.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/ManifestLocalization.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/NativeCodeFinder.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/NativeCodeFinder.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/NativeCodeFinder.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/NativeCodeFinder.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/PermissionData.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/PermissionData.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/PermissionData.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/PermissionData.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2018 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -110,6 +113,27 @@ import org.osgi.resource.Namespace; import org.osgi.resource.Requirement; public class Storage { + public static class StorageException extends RuntimeException { + private static final long serialVersionUID = 1L; + + public StorageException() { + super(); + } + + public StorageException(String message, Throwable cause) { + super(message, cause); + } + + public StorageException(String message) { + super(message); + } + + public StorageException(Throwable cause) { + super(cause); + } + + } + public static final int VERSION = 4; private static final int MR_JAR_VERSION = 4; private static final int LOWEST_VERSION_SUPPORTED = 3; @@ -931,15 +955,19 @@ public class Storage { return bundleID + "/" + generationID + "/" + BUNDLE_FILE_NAME; //$NON-NLS-1$ //$NON-NLS-2$ } - public File getFile(String path, boolean checkParent) { + public File getFile(String path, boolean checkParent) throws StorageException { + return getFile(null, path, checkParent); + } + + public File getFile(String base, String path, boolean checkParent) throws StorageException { // first check the child location - File childPath = new File(childRoot, path); + File childPath = getFile(childRoot, base, path); // now check the parent if (checkParent && parentRoot != null) { if (childPath.exists()) { return childPath; } - File parentPath = new File(parentRoot, path); + File parentPath = getFile(parentRoot, base, path); if (parentPath.exists()) { // only use the parent file only if it exists; return parentPath; @@ -949,6 +977,25 @@ public class Storage { return childPath; } + private static File getFile(File root, String base, String path) { + if (base != null) { + // if base is not null then move root to include the base + root = new File(root, base); + } + File result = new File(root, path); + + try { + String resultCanonical = result.getCanonicalPath(); + String rootCanonical = root.getCanonicalPath(); + if (!resultCanonical.startsWith(rootCanonical + File.separator) && !resultCanonical.equals(rootCanonical)) { + throw new StorageException("Invalid path: " + path); //$NON-NLS-1$ + } + } catch (IOException e) { + throw new StorageException("Invalid path: " + path, e); //$NON-NLS-1$ + } + return result; + } + private File stageContent(final InputStream in, final URL sourceURL) throws BundleException { if (System.getSecurityManager() == null) return stageContent0(in, sourceURL); @@ -969,10 +1016,7 @@ public class Storage { File outFile = null; try { if (in instanceof ReferenceInputStream) { - URL reference = ((ReferenceInputStream) in).getReference(); - if (!"file".equals(reference.getProtocol())) //$NON-NLS-1$ - throw new BundleException(NLS.bind(Msg.ADAPTOR_URL_CREATE_EXCEPTION, reference)); - return new File(reference.getPath()); + return ((ReferenceInputStream) in).getReference(); } outFile = File.createTempFile(BUNDLE_FILE_NAME, ".tmp", childRoot); //$NON-NLS-1$ @@ -1663,6 +1707,7 @@ public class Storage { return result.toString(); } + @SuppressWarnings("unchecked") private String calculateVMPackages() { try { List packages = new ArrayList<>(); @@ -1673,18 +1718,30 @@ public class Storage { Method getDescriptor = moduleClass.getMethod("getDescriptor"); //$NON-NLS-1$ Class moduleDescriptorClass = Class.forName("java.lang.module.ModuleDescriptor"); //$NON-NLS-1$ Method exports = moduleDescriptorClass.getMethod("exports"); //$NON-NLS-1$ + Method isAutomatic = moduleDescriptorClass.getMethod("isAutomatic"); //$NON-NLS-1$ + Method packagesMethod = moduleDescriptorClass.getMethod("packages"); //$NON-NLS-1$ Class exportsClass = Class.forName("java.lang.module.ModuleDescriptor$Exports"); //$NON-NLS-1$ - Method targets = exportsClass.getMethod("targets"); //$NON-NLS-1$ + Method isQualified = exportsClass.getMethod("isQualified"); //$NON-NLS-1$ Method source = exportsClass.getMethod("source"); //$NON-NLS-1$ Object bootLayer = boot.invoke(null); Set bootModules = (Set) modules.invoke(bootLayer); for (Object m : bootModules) { Object descriptor = getDescriptor.invoke(m); - for (Object export : (Set) exports.invoke(descriptor)) { - String pkg = (String) source.invoke(export); - if (((Set) targets.invoke(export)).isEmpty()) { - packages.add(pkg); + if ((Boolean) isAutomatic.invoke(descriptor)) { + /* + * Automatic modules are supposed to export all their packages. + * However, java.lang.module.ModuleDescriptor::exports returns an empty set for them. + * Add all their packages (as returned by java.lang.module.ModuleDescriptor::packages) + * to the list of VM supplied packages. + */ + packages.addAll((Set) packagesMethod.invoke(descriptor)); + } else { + for (Object export : (Set) exports.invoke(descriptor)) { + String pkg = (String) source.invoke(export); + if (!((Boolean) isQualified.invoke(export))) { + packages.add(pkg); + } } } } diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/StorageUtil.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/StorageUtil.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/StorageUtil.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/StorageUtil.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/SystemBundleFile.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/SystemBundleFile.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/SystemBundleFile.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/SystemBundleFile.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/bundleentry/Handler.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/bundleentry/Handler.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/bundleentry/Handler.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/bundleentry/Handler.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/bundleresource/Handler.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/bundleresource/Handler.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/bundleresource/Handler.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/bundleresource/Handler.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleResourceHandler.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleResourceHandler.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleResourceHandler.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleResourceHandler.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleURLConnection.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleURLConnection.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleURLConnection.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleURLConnection.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleURLConverter.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleURLConverter.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleURLConverter.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleURLConverter.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/reference/Handler.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/reference/Handler.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/reference/Handler.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/reference/Handler.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/reference/ReferenceInputStream.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/reference/ReferenceInputStream.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/reference/ReferenceInputStream.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/reference/ReferenceInputStream.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -11,18 +14,18 @@ package org.eclipse.osgi.storage.url.reference; +import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.net.URL; /** - * InputStream subclass which provides a reference (via URL) to the data + * InputStream subclass which provides a reference (via File) to the data * rather than allowing the input stream to be directly read. */ public class ReferenceInputStream extends InputStream { - protected URL reference; + private final File reference; - public ReferenceInputStream(URL reference) { + public ReferenceInputStream(File reference) { this.reference = reference; } @@ -32,7 +35,7 @@ public class ReferenceInputStream extend throw new IOException(); } - public URL getReference() { + public File getReference() { return reference; } } diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/reference/ReferenceURLConnection.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/reference/ReferenceURLConnection.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/reference/ReferenceURLConnection.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/reference/ReferenceURLConnection.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -11,11 +14,17 @@ package org.eclipse.osgi.storage.url.reference; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; import java.net.URL; import java.net.URLConnection; import org.eclipse.osgi.framework.util.FilePath; import org.eclipse.osgi.internal.location.LocationHelper; +import org.eclipse.osgi.internal.messages.Msg; +import org.eclipse.osgi.util.NLS; /** * URLConnection for the reference protocol. @@ -23,23 +32,25 @@ import org.eclipse.osgi.internal.locatio public class ReferenceURLConnection extends URLConnection { private final String installPath; - private URL reference; + private volatile File reference; protected ReferenceURLConnection(URL url, String installPath) { super(url); this.installPath = installPath; } - @SuppressWarnings("deprecation") public synchronized void connect() throws IOException { if (!connected) { // TODO assumes that reference URLs are always based on file: URLs. // There are not solid usecases to the contrary. Yet. - // Construct the ref URL carefully so as to preserve UNC paths etc. - String path = url.getPath().substring(5); + // Construct the ref File carefully so as to preserve UNC paths etc. + String path = url.getPath(); + if (!path.startsWith("file:")) { //$NON-NLS-1$ + throw new IOException(NLS.bind(Msg.ADAPTOR_URL_CREATE_EXCEPTION, path)); + } + path = url.getPath().substring(5); File file = new File(path); - URL ref; if (!file.isAbsolute()) { if (installPath != null) file = makeAbsolute(installPath, file); @@ -47,10 +58,10 @@ public class ReferenceURLConnection exte file = LocationHelper.decodePath(file); - ref = file.toURL(); checkRead(file); - reference = ref; + reference = file; + connected = true; } } diff -pruN 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java --- 4.8-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/J2SE-1.2.profile 4.9-1/bundles/org.eclipse.osgi/J2SE-1.2.profile --- 4.8-1/bundles/org.eclipse.osgi/J2SE-1.2.profile 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/J2SE-1.2.profile 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2003, 2012 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/J2SE-1.3.profile 4.9-1/bundles/org.eclipse.osgi/J2SE-1.3.profile --- 4.8-1/bundles/org.eclipse.osgi/J2SE-1.3.profile 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/J2SE-1.3.profile 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2003, 2018 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/J2SE-1.4.profile 4.9-1/bundles/org.eclipse.osgi/J2SE-1.4.profile --- 4.8-1/bundles/org.eclipse.osgi/J2SE-1.4.profile 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/J2SE-1.4.profile 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2003, 2018 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/J2SE-1.5.profile 4.9-1/bundles/org.eclipse.osgi/J2SE-1.5.profile --- 4.8-1/bundles/org.eclipse.osgi/J2SE-1.5.profile 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/J2SE-1.5.profile 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2003, 2018 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/JavaSE-1.6.profile 4.9-1/bundles/org.eclipse.osgi/JavaSE-1.6.profile --- 4.8-1/bundles/org.eclipse.osgi/JavaSE-1.6.profile 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/JavaSE-1.6.profile 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2003, 2018 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/JavaSE-1.7.profile 4.9-1/bundles/org.eclipse.osgi/JavaSE-1.7.profile --- 4.8-1/bundles/org.eclipse.osgi/JavaSE-1.7.profile 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/JavaSE-1.7.profile 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2009, 2018 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/JavaSE-1.8.profile 4.9-1/bundles/org.eclipse.osgi/JavaSE-1.8.profile --- 4.8-1/bundles/org.eclipse.osgi/JavaSE-1.8.profile 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/JavaSE-1.8.profile 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2009, 2018 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/JavaSE-9.profile 4.9-1/bundles/org.eclipse.osgi/JavaSE-9.profile --- 4.8-1/bundles/org.eclipse.osgi/JavaSE-9.profile 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/JavaSE-9.profile 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2009, 2018 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/JavaSE_compact1-1.8.profile 4.9-1/bundles/org.eclipse.osgi/JavaSE_compact1-1.8.profile --- 4.8-1/bundles/org.eclipse.osgi/JavaSE_compact1-1.8.profile 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/JavaSE_compact1-1.8.profile 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2014, 2018 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/JavaSE_compact2-1.8.profile 4.9-1/bundles/org.eclipse.osgi/JavaSE_compact2-1.8.profile --- 4.8-1/bundles/org.eclipse.osgi/JavaSE_compact2-1.8.profile 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/JavaSE_compact2-1.8.profile 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2014, 2018 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/JavaSE_compact3-1.8.profile 4.9-1/bundles/org.eclipse.osgi/JavaSE_compact3-1.8.profile --- 4.8-1/bundles/org.eclipse.osgi/JavaSE_compact3-1.8.profile 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/JavaSE_compact3-1.8.profile 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2014, 2018 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/JRE-1.1.profile 4.9-1/bundles/org.eclipse.osgi/JRE-1.1.profile --- 4.8-1/bundles/org.eclipse.osgi/JRE-1.1.profile 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/JRE-1.1.profile 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2003, 2012 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF 2018-08-27 15:36:00.000000000 +0000 @@ -101,7 +101,7 @@ Bundle-Activator: org.eclipse.osgi.inter Bundle-Description: %systemBundle Bundle-Copyright: %copyright Bundle-Vendor: %eclipse.org -Bundle-Version: 3.13.0.qualifier +Bundle-Version: 3.13.100.qualifier Bundle-Localization: systembundle Bundle-DocUrl: http://www.eclipse.org Eclipse-ExtensibleAPI: true diff -pruN 4.8-1/bundles/org.eclipse.osgi/OSGi_Minimum-1.0.profile 4.9-1/bundles/org.eclipse.osgi/OSGi_Minimum-1.0.profile --- 4.8-1/bundles/org.eclipse.osgi/OSGi_Minimum-1.0.profile 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/OSGi_Minimum-1.0.profile 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2003, 2018 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/OSGi_Minimum-1.1.profile 4.9-1/bundles/org.eclipse.osgi/OSGi_Minimum-1.1.profile --- 4.8-1/bundles/org.eclipse.osgi/OSGi_Minimum-1.1.profile 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/OSGi_Minimum-1.1.profile 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2003, 2018 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/OSGi_Minimum-1.2.profile 4.9-1/bundles/org.eclipse.osgi/OSGi_Minimum-1.2.profile --- 4.8-1/bundles/org.eclipse.osgi/OSGi_Minimum-1.2.profile 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/OSGi_Minimum-1.2.profile 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2003, 2018 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/pom.xml 4.9-1/bundles/org.eclipse.osgi/pom.xml --- 4.8-1/bundles/org.eclipse.osgi/pom.xml 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/pom.xml 2018-08-27 15:36:00.000000000 +0000 @@ -14,12 +14,12 @@ rt.equinox.framework org.eclipse.equinox.framework - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.osgi org.eclipse.osgi - 3.13.0-SNAPSHOT + 3.13.100-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.osgi/profile.list 4.9-1/bundles/org.eclipse.osgi/profile.list --- 4.8-1/bundles/org.eclipse.osgi/profile.list 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/profile.list 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2003, 2013 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/about.html 4.9-1/bundles/org.eclipse.osgi/supplement/about.html --- 4.8-1/bundles/org.eclipse.osgi/supplement/about.html 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/about.html 2018-08-27 15:36:00.000000000 +0000 @@ -1,27 +1,37 @@ - - + + - + About -

About This Content

- -

May 11, 2006

-

License

- -

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

- -

If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

+

About This Content

+ +

November 30, 2017

+

License

+ +

+ The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

+ +

+ If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +

+

Third Party Content

@@ -61,5 +71,6 @@ service marks used in the Content are th Java and all Java-based trademarks and logos are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries. + - + \ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/build.properties 4.9-1/bundles/org.eclipse.osgi/supplement/build.properties --- 4.8-1/bundles/org.eclipse.osgi/supplement/build.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/build.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,10 +1,13 @@ ############################################################################### # Copyright (c) 2005, 2012 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF 2018-08-27 15:36:00.000000000 +0000 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.supplement -Bundle-Version: 1.8.0.qualifier +Bundle-Version: 1.8.100.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.equinox.log;version="1.0", diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/plugin.properties 4.9-1/bundles/org.eclipse.osgi/supplement/plugin.properties --- 4.8-1/bundles/org.eclipse.osgi/supplement/plugin.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/plugin.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2005, 2009 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/pom.xml 4.9-1/bundles/org.eclipse.osgi/supplement/pom.xml --- 4.8-1/bundles/org.eclipse.osgi/supplement/pom.xml 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/pom.xml 2018-08-27 15:36:00.000000000 +0000 @@ -15,13 +15,13 @@ rt.equinox.framework org.eclipse.equinox.framework - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../../ org.eclipse.equinox org.eclipse.equinox.supplement - 1.8.0-SNAPSHOT + 1.8.100-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogEntry.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogEntry.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogEntry.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogEntry.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2011 IBM Corporation and others - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Eclipse Public License v1.0 which + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 which * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 ******************************************************************************/ package org.eclipse.equinox.log; diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogReaderService.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogReaderService.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogReaderService.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogReaderService.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2011 IBM Corporation and others - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Eclipse Public License v1.0 which + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 which * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 ******************************************************************************/ package org.eclipse.equinox.log; diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogService.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogService.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogService.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogService.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2017 IBM Corporation and others - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Eclipse Public License v1.0 which + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 which * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 ******************************************************************************/ package org.eclipse.equinox.log; diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/LogFilter.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/LogFilter.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/LogFilter.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/LogFilter.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2011 IBM Corporation and others - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Eclipse Public License v1.0 which + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 which * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 ******************************************************************************/ package org.eclipse.equinox.log; diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/Logger.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/Logger.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/Logger.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/Logger.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2017 IBM Corporation and others - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Eclipse Public License v1.0 which + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 which * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 ******************************************************************************/ package org.eclipse.equinox.log; diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/LogPermissionCollection.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/LogPermissionCollection.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/LogPermissionCollection.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/LogPermissionCollection.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2011 IBM Corporation and others - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Eclipse Public License v1.0 which + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 which * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 ******************************************************************************/ package org.eclipse.equinox.log; diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/LogPermission.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/LogPermission.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/LogPermission.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/LogPermission.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2011 IBM Corporation and others - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Eclipse Public License v1.0 which + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 which * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 ******************************************************************************/ package org.eclipse.equinox.log; diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/SynchronousLogListener.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/SynchronousLogListener.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/SynchronousLogListener.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/SynchronousLogListener.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2011 IBM Corporation and others - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Eclipse Public License v1.0 which + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 which * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 ******************************************************************************/ package org.eclipse.equinox.log; diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/console/CommandInterpreter.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/console/CommandInterpreter.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/console/CommandInterpreter.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/console/CommandInterpreter.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/console/CommandProvider.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/console/CommandProvider.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/console/CommandProvider.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/console/CommandProvider.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/console/ConsoleSession.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/console/ConsoleSession.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/console/ConsoleSession.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/console/ConsoleSession.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/CopyOnWriteIdentityMap.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/CopyOnWriteIdentityMap.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/CopyOnWriteIdentityMap.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/CopyOnWriteIdentityMap.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventDispatcher.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventDispatcher.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventDispatcher.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventDispatcher.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventListeners.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventListeners.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventListeners.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventListeners.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventManager.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventManager.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventManager.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventManager.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/ListenerQueue.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/ListenerQueue.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/ListenerQueue.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/ListenerQueue.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFileInputStream.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFileInputStream.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFileInputStream.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFileInputStream.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFile.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFile.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFile.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFile.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFileOutputStream.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFileOutputStream.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFileOutputStream.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFileOutputStream.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/log/FrameworkLogEntry.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/log/FrameworkLogEntry.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/log/FrameworkLogEntry.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/log/FrameworkLogEntry.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/log/FrameworkLog.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/log/FrameworkLog.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/log/FrameworkLog.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/log/FrameworkLog.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/LocationHelper.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/LocationHelper.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/LocationHelper.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/LocationHelper.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaIo.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaIo.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaIo.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaIo.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaNio.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaNio.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaNio.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaNio.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/messages/ExternalMessages.properties 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/messages/ExternalMessages.properties --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/messages/ExternalMessages.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/messages/ExternalMessages.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2003, 2018 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation @@ -134,7 +137,7 @@ ModuleResolutionReport_FilteredByHook=Bu ModuleResolutionReport_NoReport=No resolution report for the bundle. ModuleResolutionReport_Unknown=Unknown error: ModuleResolutionReport_UnresolvedReq=Unresolved requirement: -ModuleResolutionReport_UsesConstraintError=Bundle was not resolved because of a uses contraint violation. +ModuleResolutionReport_UsesConstraintError=Bundle was not resolved because of a uses constraint violation. ModuleResolver_RecursiveError=Detected a recursive resolve operation. ModuleResolver_SingletonDisabledError=Could not resolve mandatory modules because another singleton was selected or the module was disabled: diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/messages/Msg.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/messages/Msg.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/messages/Msg.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/messages/Msg.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/util/SupplementDebug.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/util/SupplementDebug.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/util/SupplementDebug.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/util/SupplementDebug.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/util/Tokenizer.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/util/Tokenizer.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/util/Tokenizer.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/util/Tokenizer.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/report/resolution/ResolutionReport.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/report/resolution/ResolutionReport.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/report/resolution/ResolutionReport.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/report/resolution/ResolutionReport.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/datalocation/Location.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/datalocation/Location.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/datalocation/Location.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/datalocation/Location.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/debug/DebugOptions.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/debug/DebugOptions.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/debug/DebugOptions.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/debug/DebugOptions.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2014 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/debug/DebugOptionsListener.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/debug/DebugOptionsListener.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/debug/DebugOptionsListener.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/debug/DebugOptionsListener.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/debug/DebugTrace.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/debug/DebugTrace.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/debug/DebugTrace.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/debug/DebugTrace.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2014 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/EnvironmentInfo.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/EnvironmentInfo.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/EnvironmentInfo.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/EnvironmentInfo.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/localization/BundleLocalization.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/localization/BundleLocalization.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/localization/BundleLocalization.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/localization/BundleLocalization.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/localization/LocaleProvider.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/localization/LocaleProvider.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/localization/LocaleProvider.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/localization/LocaleProvider.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/runnable/ApplicationLauncher.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/runnable/ApplicationLauncher.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/runnable/ApplicationLauncher.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/runnable/ApplicationLauncher.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/runnable/ApplicationRunnable.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/runnable/ApplicationRunnable.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/runnable/ApplicationRunnable.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/runnable/ApplicationRunnable.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/runnable/ParameterizedRunnable.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/runnable/ParameterizedRunnable.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/runnable/ParameterizedRunnable.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/runnable/ParameterizedRunnable.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/runnable/StartupMonitor.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/runnable/StartupMonitor.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/runnable/StartupMonitor.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/runnable/StartupMonitor.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Andrew Niefer - IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/urlconversion/URLConverter.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/urlconversion/URLConverter.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/urlconversion/URLConverter.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/urlconversion/URLConverter.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/ManagedOutputStream.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/ManagedOutputStream.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/ManagedOutputStream.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/ManagedOutputStream.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2014 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/NLS.java 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/NLS.java --- 4.8-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/NLS.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/NLS.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi/systembundle.properties 4.9-1/bundles/org.eclipse.osgi/systembundle.properties --- 4.8-1/bundles/org.eclipse.osgi/systembundle.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi/systembundle.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,15 +1,18 @@ ############################################################################### # Copyright (c) 2003, 2009 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation ############################################################################### systemBundle = OSGi System Bundle eclipse.org = Eclipse.org - Equinox -copyright = Copyright (c) 2003, 2014 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html +copyright = Copyright (c) 2003, 2018 IBM Corporation and others. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/ trace.component.label = Equinox OSGi Framework \ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/about.html 4.9-1/bundles/org.eclipse.osgi.compatibility.state/about.html --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/about.html 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/about.html 2018-08-27 15:36:00.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

About This Content

- -

June 2, 2006

-

License

+

About This Content

-

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

+

November 30, 2017

+

License

-

If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

+

+ The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

+ +

+ If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +

\ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.osgi.compatibility.state/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/META-INF/MANIFEST.MF 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/META-INF/MANIFEST.MF 2018-08-27 15:36:00.000000000 +0000 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.osgi.compatibility.state -Bundle-Version: 1.1.100.qualifier +Bundle-Version: 1.1.200.qualifier ExtensionBundle-Activator: org.eclipse.osgi.compatibility.state.Activator Fragment-Host: org.eclipse.osgi;bundle-version="3.12.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/pom.xml 4.9-1/bundles/org.eclipse.osgi.compatibility.state/pom.xml --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/pom.xml 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/pom.xml 2018-08-27 15:36:00.000000000 +0000 @@ -14,11 +14,11 @@ rt.equinox.framework org.eclipse.equinox.framework - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.osgi org.eclipse.osgi.compatibility.state - 1.1.100-SNAPSHOT + 1.1.200-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/Activator.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,8 +1,12 @@ /******************************************************************************* - * Copyright (c) 2013 IBM Corporation and others. All rights reserved. + * Copyright (c) 2013 IBM Corporation and others. + * * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html + * terms of the Eclipse Public License 2.0 which accompanies this distribution, + * and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: IBM - Initial API and implementation ******************************************************************************/ diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformAdminImpl.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformAdminImpl.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformAdminImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformAdminImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,8 +1,12 @@ /******************************************************************************* - * Copyright (c) 2012, 2017 IBM Corporation and others. All rights reserved. + * Copyright (c) 2012, 2017 IBM Corporation and others. + * * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html + * terms of the Eclipse Public License 2.0 which accompanies this distribution, + * and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformBundleListener.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformBundleListener.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformBundleListener.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformBundleListener.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,8 +1,12 @@ /******************************************************************************* - * Copyright (c) 2013, 2016 IBM Corporation and others. All rights reserved. + * Copyright (c) 2013, 2016 IBM Corporation and others. + * * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html + * terms of the Eclipse Public License 2.0 which accompanies this distribution, + * and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/ReadOnlyState.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/ReadOnlyState.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/ReadOnlyState.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/ReadOnlyState.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/StateConverter.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/StateConverter.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/StateConverter.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/StateConverter.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,8 +1,12 @@ /******************************************************************************* - * Copyright (c) 2013, 2016 IBM Corporation and others. All rights reserved. + * Copyright (c) 2013, 2016 IBM Corporation and others. + * * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html + * terms of the Eclipse Public License 2.0 which accompanies this distribution, + * and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/BundleConstraint.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/BundleConstraint.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/BundleConstraint.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/BundleConstraint.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/CompositeResolveHelper.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/CompositeResolveHelper.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/CompositeResolveHelper.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/CompositeResolveHelper.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/CompositeResolveHelperRegistry.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/CompositeResolveHelperRegistry.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/CompositeResolveHelperRegistry.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/CompositeResolveHelperRegistry.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GenericCapability.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GenericCapability.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GenericCapability.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GenericCapability.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2018 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GenericConstraint.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GenericConstraint.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GenericConstraint.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GenericConstraint.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2018 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GroupingChecker.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GroupingChecker.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GroupingChecker.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GroupingChecker.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,8 +1,12 @@ /******************************************************************************* - * Copyright (c) 2004, 2016 IBM Corporation and others. All rights reserved. + * Copyright (c) 2004, 2016 IBM Corporation and others. + * * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html + * terms of the Eclipse Public License 2.0 which accompanies this distribution, + * and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/MappedList.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/MappedList.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/MappedList.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/MappedList.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/PermissionChecker.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/PermissionChecker.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/PermissionChecker.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/PermissionChecker.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverBundle.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverBundle.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverBundle.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverBundle.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2018 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverConstraint.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverConstraint.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverConstraint.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverConstraint.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,8 +1,12 @@ /******************************************************************************* - * Copyright (c) 2005, 2011 IBM Corporation and others. All rights reserved. This - * program and the accompanying materials are made available under the terms of - * the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html + * Copyright (c) 2005, 2011 IBM Corporation and others. + * + * This program and the accompanying materials are made available under the terms of + * the Eclipse Public License 2.0 which accompanies this distribution, and is + * available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverExport.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverExport.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverExport.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverExport.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImpl.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImpl.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,8 +1,12 @@ /******************************************************************************* - * Copyright (c) 2004, 2018 IBM Corporation and others. All rights reserved. + * Copyright (c) 2004, 2018 IBM Corporation and others. + * * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html + * terms of the Eclipse Public License 2.0 which accompanies this distribution, + * and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImport.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImport.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImport.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImport.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/VersionHashMap.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/VersionHashMap.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/VersionHashMap.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/VersionHashMap.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/VersionSupplier.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/VersionSupplier.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/VersionSupplier.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/VersionSupplier.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BaseDescriptionImpl.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BaseDescriptionImpl.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BaseDescriptionImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BaseDescriptionImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BundleDeltaImpl.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BundleDeltaImpl.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BundleDeltaImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BundleDeltaImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BundleDescriptionImpl.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BundleDescriptionImpl.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BundleDescriptionImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BundleDescriptionImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BundleSpecificationImpl.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BundleSpecificationImpl.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BundleSpecificationImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BundleSpecificationImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ExportPackageDescriptionImpl.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ExportPackageDescriptionImpl.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ExportPackageDescriptionImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ExportPackageDescriptionImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/GenericDescriptionImpl.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/GenericDescriptionImpl.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/GenericDescriptionImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/GenericDescriptionImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/GenericSpecificationImpl.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/GenericSpecificationImpl.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/GenericSpecificationImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/GenericSpecificationImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/HostSpecificationImpl.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/HostSpecificationImpl.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/HostSpecificationImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/HostSpecificationImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ImportPackageSpecificationImpl.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ImportPackageSpecificationImpl.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ImportPackageSpecificationImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ImportPackageSpecificationImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeDescriptionImpl.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeDescriptionImpl.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeDescriptionImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeDescriptionImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeSpecificationImpl.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeSpecificationImpl.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeSpecificationImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeSpecificationImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2014 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ResolverErrorImpl.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ResolverErrorImpl.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ResolverErrorImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ResolverErrorImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateBuilder.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateBuilder.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateBuilder.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateBuilder.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2018 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateDeltaImpl.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateDeltaImpl.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateDeltaImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateDeltaImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateHelperImpl.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateHelperImpl.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateHelperImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateHelperImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateImpl.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateImpl.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,14 +1,18 @@ /******************************************************************************* - * Copyright (c) 2003, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * Copyright (c) 2003, 2018 IBM Corporation and others. + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation * Danail Nachev - ProSyst - bug 218625 * Rob Harrop - SpringSource Inc. (bug 247522) + * Karsten Thoms (itemis) - bug 535341 *******************************************************************************/ package org.eclipse.osgi.internal.resolver; @@ -121,6 +125,7 @@ public abstract class StateImpl implemen private StateObjectFactory factory; private final KeyedHashSet resolvedBundles = new KeyedHashSet(); private final Map> disabledBundles = new HashMap<>(); + private final Map> bundleNameCache = new HashMap<>(); private boolean fullyLoaded = false; private boolean dynamicCacheChanged = false; // only used for lazy loading of BundleDescriptions @@ -182,6 +187,7 @@ public abstract class StateImpl implemen return false; if (!bundleDescriptions.remove(existing)) return false; + removeBundleNameCacheEntry(existing); resolvedBundles.remove(existing); List infos = disabledBundles.remove(existing); if (infos != null) { @@ -237,6 +243,7 @@ public abstract class StateImpl implemen return false; resolvedBundles.remove((KeyedElement) toRemove); disabledBundles.remove(toRemove); + removeBundleNameCacheEntry(toRemove); resolved = false; getDelta().recordBundleRemoved((BundleDescriptionImpl) toRemove); ((BundleDescriptionImpl) toRemove).setStateBit(BundleDescriptionImpl.REMOVAL_PENDING, true); @@ -282,11 +289,9 @@ public abstract class StateImpl implemen synchronized (this.monitor) { if (Constants.SYSTEM_BUNDLE_SYMBOLICNAME.equals(symbolicName)) symbolicName = getSystemBundle(); - final List bundles = new ArrayList<>(); - for (Iterator iter = bundleDescriptions.iterator(); iter.hasNext();) { - BundleDescription bundle = (BundleDescription) iter.next(); - if (symbolicName.equals(bundle.getSymbolicName())) - bundles.add(bundle); + final Set bundles = bundleNameCache.get(symbolicName); + if (bundles == null) { + return new BundleDescription[0]; } return bundles.toArray(new BundleDescription[bundles.size()]); } @@ -684,6 +689,7 @@ public abstract class StateImpl implemen if (bundleDescriptions.add((BundleDescriptionImpl) description)) { if (description.getBundleId() > getHighestBundleId()) highestBundleId = description.getBundleId(); + addBundleNameCacheEntry(description); return true; } return false; @@ -1331,4 +1337,23 @@ public abstract class StateImpl implemen } return results.toArray(new DisabledInfo[results.size()]); } + + private void addBundleNameCacheEntry(BundleDescription description) { + Set descriptions = bundleNameCache.get(description.getSymbolicName()); + if (descriptions == null) { + descriptions = new LinkedHashSet<>(); + bundleNameCache.put(description.getSymbolicName(), descriptions); + } + descriptions.add(description); + } + + private void removeBundleNameCacheEntry(BundleDescription description) { + Set descriptions = bundleNameCache.get(description.getSymbolicName()); + if (descriptions != null) { + descriptions.remove(description); + if (descriptions.isEmpty()) { + bundleNameCache.remove(description.getSymbolicName()); + } + } + } } diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateMessages.properties 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateMessages.properties --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateMessages.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateMessages.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2004, 2018 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateMsg.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateMsg.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateMsg.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateMsg.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateObjectFactoryImpl.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateObjectFactoryImpl.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateObjectFactoryImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateObjectFactoryImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateReader.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateReader.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateReader.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateReader.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateWriter.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateWriter.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateWriter.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateWriter.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/UserState.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/UserState.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/UserState.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/UserState.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/VersionConstraintImpl.java 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/VersionConstraintImpl.java --- 4.8-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/VersionConstraintImpl.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/VersionConstraintImpl.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.services/about.html 4.9-1/bundles/org.eclipse.osgi.services/about.html --- 4.8-1/bundles/org.eclipse.osgi.services/about.html 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.services/about.html 2018-08-27 15:36:00.000000000 +0000 @@ -2,28 +2,37 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

About This Content

- -

August 25, 2006

-

License

+

About This Content

-

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

+

November 30, 2017

+

License

-

If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

+

+ The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

+

+ If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +

+ +

Third Party Content

The Content includes items that have been sourced from third parties as set out below. If you diff -pruN 4.8-1/bundles/org.eclipse.osgi.services/build.properties 4.9-1/bundles/org.eclipse.osgi.services/build.properties --- 4.8-1/bundles/org.eclipse.osgi.services/build.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.services/build.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2003, 2013 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF 2018-08-27 15:36:00.000000000 +0000 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %osgiServices Bundle-SymbolicName: org.eclipse.osgi.services -Bundle-Version: 3.7.0.qualifier +Bundle-Version: 3.7.100.qualifier Bundle-Description: %osgiServicesDes Bundle-Localization: plugin Bundle-Vendor: %eclipse.org diff -pruN 4.8-1/bundles/org.eclipse.osgi.services/plugin.properties 4.9-1/bundles/org.eclipse.osgi.services/plugin.properties --- 4.8-1/bundles/org.eclipse.osgi.services/plugin.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.services/plugin.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2003, 2009 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.services/pom.xml 4.9-1/bundles/org.eclipse.osgi.services/pom.xml --- 4.8-1/bundles/org.eclipse.osgi.services/pom.xml 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.services/pom.xml 2018-08-27 15:36:00.000000000 +0000 @@ -14,12 +14,12 @@ rt.equinox.framework org.eclipse.equinox.framework - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.osgi org.eclipse.osgi.services - 3.7.0-SNAPSHOT + 3.7.100-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/about.html 4.9-1/bundles/org.eclipse.osgi.tests/about.html --- 4.8-1/bundles/org.eclipse.osgi.tests/about.html 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/about.html 2018-08-27 15:36:00.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

About This Content

- -

June 2, 2006

-

License

+

About This Content

-

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

+

November 30, 2017

+

License

-

If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

+

+ The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

+ +

+ If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +

\ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/build.properties 4.9-1/bundles/org.eclipse.osgi.tests/build.properties --- 4.8-1/bundles/org.eclipse.osgi.tests/build.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/build.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2000, 2016 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation @@ -15,7 +18,8 @@ bin.includes = .,\ META-INF/,\ test.xml,\ bundle_tests/*.jar,\ - plugin.xml + plugin.xml,\ + profile.list source.bundle_tests/test.jar = bundles_src/test/ manifest.bundle_tests/test.jar = META-INF/MANIFEST.MF @@ -235,13 +239,6 @@ source.bundle_tests/test.bug375784.jar = manifest.bundle_tests/test.bug375784.jar = META-INF/MANIFEST.MF source.bundle_tests/storage.hooks.a.jar = bundles_src/storage.hooks.a/ manifest.bundle_tests/storage.hooks.a.jar = META-INF/MANIFEST.MF -source.bundle_tests/test.plugins.a.jar = bundles_src/test.plugins.a/ -source.bundle_tests/test.plugins.b.jar = bundles_src/test.plugins.b/ -source.bundle_tests/test.plugins.c.jar = bundles_src/test.plugins.c/ -source.bundle_tests/test.plugins.d.jar = bundles_src/test.plugins.d/ -source.bundle_tests/test.plugins.e.jar = bundles_src/test.plugins.e/ -source.bundle_tests/test.plugins.f.jar = bundles_src/test.plugins.f/ -source.bundle_tests/test.plugins.g.jar = bundles_src/test.plugins.g/ source.bundle_tests/test.bug412228.jar = bundles_src/test.bug412228/ manifest.bundle_tests/test.bug412228.jar = META-INF/MANIFEST.MF source.bundle_tests/test.uninstall.start1.jar = bundles_src/test.uninstall.start1/ diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/activator.error1/activator/error1/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/activator.error1/activator/error1/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/activator.error1/activator/error1/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/activator.error1/activator/error1/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/activator.error2/activator/error2/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/activator.error2/activator/error2/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/activator.error2/activator/error2/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/activator.error2/activator/error2/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/activator.error3/activator/error3/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/activator.error3/activator/error3/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/activator.error3/activator/error3/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/activator.error3/activator/error3/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/buddy.dependent.a.test1/buddy/dependent/a/test1/ATest.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/buddy.dependent.a.test1/buddy/dependent/a/test1/ATest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/buddy.dependent.a.test1/buddy/dependent/a/test1/ATest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/buddy.dependent.a.test1/buddy/dependent/a/test1/ATest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/buddy.dependent.a.test2/buddy/dependent/a/test2/ATest.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/buddy.dependent.a.test2/buddy/dependent/a/test2/ATest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/buddy.dependent.a.test2/buddy/dependent/a/test2/ATest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/buddy.dependent.a.test2/buddy/dependent/a/test2/ATest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/buddy.registered.a.test1/buddy/registered/a/test1/ATest.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/buddy.registered.a.test1/buddy/registered/a/test1/ATest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/buddy.registered.a.test1/buddy/registered/a/test1/ATest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/buddy.registered.a.test1/buddy/registered/a/test1/ATest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/buddy.registered.a.test2/buddy/registered/a/test2/ATest.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/buddy.registered.a.test2/buddy/registered/a/test2/ATest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/buddy.registered.a.test2/buddy/registered/a/test2/ATest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/buddy.registered.a.test2/buddy/registered/a/test2/ATest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test/chain/test/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test/chain/test/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test/chain/test/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test/chain/test/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test/chain/test/TestMultiChain.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test/chain/test/TestMultiChain.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test/chain/test/TestMultiChain.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test/chain/test/TestMultiChain.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test/chain/test/TestSingleChain.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test/chain/test/TestSingleChain.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test/chain/test/TestSingleChain.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test/chain/test/TestSingleChain.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.a/chain/test/a/AChain.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.a/chain/test/a/AChain.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.a/chain/test/a/AChain.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.a/chain/test/a/AChain.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.a/chain/test/a/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.a/chain/test/a/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.a/chain/test/a/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.a/chain/test/a/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.a/chain/test/a/AMultiChain1.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.a/chain/test/a/AMultiChain1.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.a/chain/test/a/AMultiChain1.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.a/chain/test/a/AMultiChain1.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.a/chain/test/a/AMultiChain2.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.a/chain/test/a/AMultiChain2.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.a/chain/test/a/AMultiChain2.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.a/chain/test/a/AMultiChain2.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.b/chain/test/b/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.b/chain/test/b/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.b/chain/test/b/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.b/chain/test/b/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.b/chain/test/b/BChain.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.b/chain/test/b/BChain.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.b/chain/test/b/BChain.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.b/chain/test/b/BChain.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.b/chain/test/b/BMultiChain1.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.b/chain/test/b/BMultiChain1.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.b/chain/test/b/BMultiChain1.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.b/chain/test/b/BMultiChain1.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.b/chain/test/b/BMultiChain2.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.b/chain/test/b/BMultiChain2.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.b/chain/test/b/BMultiChain2.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.b/chain/test/b/BMultiChain2.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.c/chain/test/c/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.c/chain/test/c/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.c/chain/test/c/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.c/chain/test/c/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.c/chain/test/c/CMultipleChain1.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.c/chain/test/c/CMultipleChain1.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.c/chain/test/c/CMultipleChain1.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.c/chain/test/c/CMultipleChain1.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.c/chain/test/c/CMultipleChain2.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.c/chain/test/c/CMultipleChain2.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.c/chain/test/c/CMultipleChain2.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.c/chain/test/c/CMultipleChain2.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.d/chain/test/d/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.d/chain/test/d/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.d/chain/test/d/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.d/chain/test/d/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.d/chain/test/d/DMultipleChain1.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.d/chain/test/d/DMultipleChain1.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.d/chain/test/d/DMultipleChain1.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/chain.test.d/chain/test/d/DMultipleChain1.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/circularity.test/circularity/test/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/circularity.test/circularity/test/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/circularity.test/circularity/test/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/circularity.test/circularity/test/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/circularity.test/circularity/test/TestCircularity.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/circularity.test/circularity/test/TestCircularity.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/circularity.test/circularity/test/TestCircularity.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/circularity.test/circularity/test/TestCircularity.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/circularity.test.a/circularity/test/a/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/circularity.test.a/circularity/test/a/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/circularity.test.a/circularity/test/a/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/circularity.test.a/circularity/test/a/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/circularity.test.a/circularity/test/a/ICircularity.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/circularity.test.a/circularity/test/a/ICircularity.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/circularity.test.a/circularity/test/a/ICircularity.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/circularity.test.a/circularity/test/a/ICircularity.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/classloader.hooks.a/org/eclipse/osgi/tests/classloader/hooks/a/TestHookConfigurator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/classloader.hooks.a/org/eclipse/osgi/tests/classloader/hooks/a/TestHookConfigurator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/classloader.hooks.a/org/eclipse/osgi/tests/classloader/hooks/a/TestHookConfigurator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/classloader.hooks.a/org/eclipse/osgi/tests/classloader/hooks/a/TestHookConfigurator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/client1.multiple.exports/client1/multiple/exports/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/client1.multiple.exports/client1/multiple/exports/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/client1.multiple.exports/client1/multiple/exports/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/client1.multiple.exports/client1/multiple/exports/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/client2.multiple.exports/client2/multiple/exports/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/client2.multiple.exports/client2/multiple/exports/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/client2.multiple.exports/client2/multiple/exports/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/client2.multiple.exports/client2/multiple/exports/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/exporter.importer1/exporter/importer/test/Test1.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/exporter.importer1/exporter/importer/test/Test1.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/exporter.importer1/exporter/importer/test/Test1.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/exporter.importer1/exporter/importer/test/Test1.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/exporter.importer2/exporter/importer/test/Test2.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/exporter.importer2/exporter/importer/test/Test2.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/exporter.importer2/exporter/importer/test/Test2.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/exporter.importer2/exporter/importer/test/Test2.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/exporter.importer3/exporter/importer/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/exporter.importer3/exporter/importer/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/exporter.importer3/exporter/importer/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/exporter.importer3/exporter/importer/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/exporter.importer3/exporter/importer/test/Test3.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/exporter.importer3/exporter/importer/test/Test3.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/exporter.importer3/exporter/importer/test/Test3.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/exporter.importer3/exporter/importer/test/Test3.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/ext.extclasspath.a/ext/extclasspath/a/ExtClasspathExtTest.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/ext.extclasspath.a/ext/extclasspath/a/ExtClasspathExtTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/ext.extclasspath.a/ext/extclasspath/a/ExtClasspathExtTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/ext.extclasspath.a/ext/extclasspath/a/ExtClasspathExtTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/ext.extclasspath.a.importer/ext/extclasspath/a/importer/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/ext.extclasspath.a.importer/ext/extclasspath/a/importer/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/ext.extclasspath.a.importer/ext/extclasspath/a/importer/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/ext.extclasspath.a.importer/ext/extclasspath/a/importer/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/ext.framework.a/ext/framework/a/FrameworkExtTest.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/ext.framework.a/ext/framework/a/FrameworkExtTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/ext.framework.a/ext/framework/a/FrameworkExtTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/ext.framework.a/ext/framework/a/FrameworkExtTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/ext.framework.a.importer/ext/framework/a/importer/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/ext.framework.a.importer/ext/framework/a/importer/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/ext.framework.a.importer/ext/framework/a/importer/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/ext.framework.a.importer/ext/framework/a/importer/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/ext.framework.a.requires/ext/framework/a/requires/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/ext.framework.a.requires/ext/framework/a/requires/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/ext.framework.a.requires/ext/framework/a/requires/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/ext.framework.a.requires/ext/framework/a/requires/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/ext.framework.b/ext/framework/b/TestCondition.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/ext.framework.b/ext/framework/b/TestCondition.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/ext.framework.b/ext/framework/b/TestCondition.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/ext.framework.b/ext/framework/b/TestCondition.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.frag.a/fragment/test/attach/host/a/internal/test/TestPackageAccess2.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.frag.a/fragment/test/attach/host/a/internal/test/TestPackageAccess2.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.frag.a/fragment/test/attach/host/a/internal/test/TestPackageAccess2.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.frag.a/fragment/test/attach/host/a/internal/test/TestPackageAccess2.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.frag.a/fragment/test/attach/host/a/internal/test/TestPackageAccess.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.frag.a/fragment/test/attach/host/a/internal/test/TestPackageAccess.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.frag.a/fragment/test/attach/host/a/internal/test/TestPackageAccess.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.frag.a/fragment/test/attach/host/a/internal/test/TestPackageAccess.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.frag.b/fragment/test/attach/frag/b/Test.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.frag.b/fragment/test/attach/frag/b/Test.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.frag.b/fragment/test/attach/frag/b/Test.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.frag.b/fragment/test/attach/frag/b/Test.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.host.a/fragment/test/attach/host/a/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.host.a/fragment/test/attach/host/a/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.host.a/fragment/test/attach/host/a/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.host.a/fragment/test/attach/host/a/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.host.a/fragment/test/attach/host/a/internal/test/PackageAccessTest.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.host.a/fragment/test/attach/host/a/internal/test/PackageAccessTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.host.a/fragment/test/attach/host/a/internal/test/PackageAccessTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.host.a/fragment/test/attach/host/a/internal/test/PackageAccessTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.host.a.v2/fragment/test/attach/host/a/Activator2.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.host.a.v2/fragment/test/attach/host/a/Activator2.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.host.a.v2/fragment/test/attach/host/a/Activator2.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.host.a.v2/fragment/test/attach/host/a/Activator2.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.host.a.v2/fragment/test/attach/host/a/internal/test/PackageAccessTest2.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.host.a.v2/fragment/test/attach/host/a/internal/test/PackageAccessTest2.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.host.a.v2/fragment/test/attach/host/a/internal/test/PackageAccessTest2.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/fragment.test.attach.host.a.v2/fragment/test/attach/host/a/internal/test/PackageAccessTest2.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/frag.multiple.exports/host/multiple/exports/PrivateClass1.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/frag.multiple.exports/host/multiple/exports/PrivateClass1.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/frag.multiple.exports/host/multiple/exports/PrivateClass1.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/frag.multiple.exports/host/multiple/exports/PrivateClass1.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/frag.multiple.exports/host/multiple/exports/PrivateClass2.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/frag.multiple.exports/host/multiple/exports/PrivateClass2.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/frag.multiple.exports/host/multiple/exports/PrivateClass2.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/frag.multiple.exports/host/multiple/exports/PrivateClass2.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/geturl/geturl/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/geturl/geturl/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/geturl/geturl/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/geturl/geturl/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/host.multiple.exports/host/multiple/exports/onlyone/PublicClass1.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/host.multiple.exports/host/multiple/exports/onlyone/PublicClass1.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/host.multiple.exports/host/multiple/exports/onlyone/PublicClass1.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/host.multiple.exports/host/multiple/exports/onlyone/PublicClass1.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/host.multiple.exports/host/multiple/exports/PublicClass1.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/host.multiple.exports/host/multiple/exports/PublicClass1.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/host.multiple.exports/host/multiple/exports/PublicClass1.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/host.multiple.exports/host/multiple/exports/PublicClass1.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/host.multiple.exports/host/multiple/exports/PublicClass2.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/host.multiple.exports/host/multiple/exports/PublicClass2.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/host.multiple.exports/host/multiple/exports/PublicClass2.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/host.multiple.exports/host/multiple/exports/PublicClass2.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart/legacy/lazystart/FalseExceptionLegacy1.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart/legacy/lazystart/FalseExceptionLegacy1.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart/legacy/lazystart/FalseExceptionLegacy1.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart/legacy/lazystart/FalseExceptionLegacy1.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart/legacy/lazystart/FalseExceptionLegacy2.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart/legacy/lazystart/FalseExceptionLegacy2.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart/legacy/lazystart/FalseExceptionLegacy2.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart/legacy/lazystart/FalseExceptionLegacy2.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart/legacy/lazystart/SimpleLegacy.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart/legacy/lazystart/SimpleLegacy.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart/legacy/lazystart/SimpleLegacy.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart/legacy/lazystart/SimpleLegacy.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart/legacy/lazystart/TrueExceptionLegacy1.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart/legacy/lazystart/TrueExceptionLegacy1.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart/legacy/lazystart/TrueExceptionLegacy1.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart/legacy/lazystart/TrueExceptionLegacy1.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart/legacy/lazystart/TrueExceptionLegacy2.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart/legacy/lazystart/TrueExceptionLegacy2.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart/legacy/lazystart/TrueExceptionLegacy2.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart/legacy/lazystart/TrueExceptionLegacy2.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.a/legacy/lazystart/a/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.a/legacy/lazystart/a/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.a/legacy/lazystart/a/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.a/legacy/lazystart/a/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.a/legacy/lazystart/a/ATest.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.a/legacy/lazystart/a/ATest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.a/legacy/lazystart/a/ATest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.a/legacy/lazystart/a/ATest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.b/legacy/lazystart/b/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.b/legacy/lazystart/b/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.b/legacy/lazystart/b/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.b/legacy/lazystart/b/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.b/legacy/lazystart/b/BTest.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.b/legacy/lazystart/b/BTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.b/legacy/lazystart/b/BTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.b/legacy/lazystart/b/BTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.b/legacy/lazystart/b/excluded/a/BAExcluded.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.b/legacy/lazystart/b/excluded/a/BAExcluded.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.b/legacy/lazystart/b/excluded/a/BAExcluded.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.b/legacy/lazystart/b/excluded/a/BAExcluded.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.b/legacy/lazystart/b/excluded/b/BBExcluded.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.b/legacy/lazystart/b/excluded/b/BBExcluded.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.b/legacy/lazystart/b/excluded/b/BBExcluded.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.b/legacy/lazystart/b/excluded/b/BBExcluded.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.c/legacy/lazystart/c/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.c/legacy/lazystart/c/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.c/legacy/lazystart/c/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.c/legacy/lazystart/c/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.c/legacy/lazystart/c/CTest.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.c/legacy/lazystart/c/CTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.c/legacy/lazystart/c/CTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.c/legacy/lazystart/c/CTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.c/legacy/lazystart/c/excluded/a/CAExcluded.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.c/legacy/lazystart/c/excluded/a/CAExcluded.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.c/legacy/lazystart/c/excluded/a/CAExcluded.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.c/legacy/lazystart/c/excluded/a/CAExcluded.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.c/legacy/lazystart/c/excluded/b/CBExcluded.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.c/legacy/lazystart/c/excluded/b/CBExcluded.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.c/legacy/lazystart/c/excluded/b/CBExcluded.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/legacy.lazystart.c/legacy/lazystart/c/excluded/b/CBExcluded.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClass10.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClass10.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClass10.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClass10.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClass11.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClass11.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClass11.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClass11.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClass8.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClass8.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClass8.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClass8.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClass9.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClass9.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClass9.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClass9.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClassAdd10.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClassAdd10.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClassAdd10.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClassAdd10.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClassAdd11.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClassAdd11.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClassAdd11.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClassAdd11.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClassAdd8.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClassAdd8.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClassAdd8.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClassAdd8.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClassAdd9.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClassAdd9.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClassAdd9.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClassAdd9.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClassBase.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClassBase.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClassBase.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub/TestClassBase.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClass10.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClass10.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClass10.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClass10.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClass11.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClass11.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClass11.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClass11.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClass8.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClass8.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClass8.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClass8.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClass9.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClass9.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClass9.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClass9.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClassAdd10.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClassAdd10.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClassAdd10.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClassAdd10.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClassAdd11.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClassAdd11.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClassAdd11.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClassAdd11.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClassAdd8.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClassAdd8.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClassAdd8.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClassAdd8.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClassAdd9.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClassAdd9.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClassAdd9.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClassAdd9.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClassBase.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClassBase.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClassBase.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/sub2/TestClassBase.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClass10.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClass10.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClass10.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClass10.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClass11.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClass11.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClass11.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClass11.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClass8.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClass8.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClass8.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClass8.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClass9.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClass9.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClass9.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClass9.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClassAdd10.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClassAdd10.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClassAdd10.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClassAdd10.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClassAdd11.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClassAdd11.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClassAdd11.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClassAdd11.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClassAdd8.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClassAdd8.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClassAdd8.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClassAdd8.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClassAdd9.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClassAdd9.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClassAdd9.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClassAdd9.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClassBase.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClassBase.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClassBase.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestClassBase.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestService9.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestService9.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestService9.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestService9.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestServiceBase.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestServiceBase.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestServiceBase.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestServiceBase.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestService.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestService.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestService.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/mrBundleInputBase/multi/release/test/TestService.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.a1/nativetest/a1/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.a1/nativetest/a1/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.a1/nativetest/a1/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.a1/nativetest/a1/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.a2/nativetest/a2/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.a2/nativetest/a2/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.a2/nativetest/a2/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.a2/nativetest/a2/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.b1/nativetest/b1/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.b1/nativetest/b1/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.b1/nativetest/b1/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.b1/nativetest/b1/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.b2/nativetest/b2/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.b2/nativetest/b2/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.b2/nativetest/b2/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.b2/nativetest/b2/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.c/nativetest/c/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.c/nativetest/c/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.c/nativetest/c/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.c/nativetest/c/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.d/nativetest/d/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.d/nativetest/d/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.d/nativetest/d/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.d/nativetest/d/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.e/nativetest/e/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.e/nativetest/e/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.e/nativetest/e/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/nativetest.e/nativetest/e/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2014 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart/osgi/lazystart/LazyExclude1.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart/osgi/lazystart/LazyExclude1.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart/osgi/lazystart/LazyExclude1.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart/osgi/lazystart/LazyExclude1.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart/osgi/lazystart/LazyExclude2.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart/osgi/lazystart/LazyExclude2.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart/osgi/lazystart/LazyExclude2.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart/osgi/lazystart/LazyExclude2.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart/osgi/lazystart/LazyInclude1.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart/osgi/lazystart/LazyInclude1.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart/osgi/lazystart/LazyInclude1.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart/osgi/lazystart/LazyInclude1.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart/osgi/lazystart/LazyInclude2.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart/osgi/lazystart/LazyInclude2.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart/osgi/lazystart/LazyInclude2.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart/osgi/lazystart/LazyInclude2.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart/osgi/lazystart/LazySimple.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart/osgi/lazystart/LazySimple.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart/osgi/lazystart/LazySimple.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart/osgi/lazystart/LazySimple.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.a/osgi/lazystart/a/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.a/osgi/lazystart/a/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.a/osgi/lazystart/a/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.a/osgi/lazystart/a/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.a/osgi/lazystart/a/ATest.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.a/osgi/lazystart/a/ATest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.a/osgi/lazystart/a/ATest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.a/osgi/lazystart/a/ATest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.b/osgi/lazystart/b/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.b/osgi/lazystart/b/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.b/osgi/lazystart/b/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.b/osgi/lazystart/b/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.b/osgi/lazystart/b/BTest.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.b/osgi/lazystart/b/BTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.b/osgi/lazystart/b/BTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.b/osgi/lazystart/b/BTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.b/osgi/lazystart/b/excluded/a/BAExcluded.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.b/osgi/lazystart/b/excluded/a/BAExcluded.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.b/osgi/lazystart/b/excluded/a/BAExcluded.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.b/osgi/lazystart/b/excluded/a/BAExcluded.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.b/osgi/lazystart/b/excluded/b/BBExcluded.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.b/osgi/lazystart/b/excluded/b/BBExcluded.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.b/osgi/lazystart/b/excluded/b/BBExcluded.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.b/osgi/lazystart/b/excluded/b/BBExcluded.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.c/osgi/lazystart/c/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.c/osgi/lazystart/c/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.c/osgi/lazystart/c/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.c/osgi/lazystart/c/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.c/osgi/lazystart/c/CTest.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.c/osgi/lazystart/c/CTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.c/osgi/lazystart/c/CTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.c/osgi/lazystart/c/CTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.c/osgi/lazystart/c/excluded/a/CAExcluded.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.c/osgi/lazystart/c/excluded/a/CAExcluded.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.c/osgi/lazystart/c/excluded/a/CAExcluded.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.c/osgi/lazystart/c/excluded/a/CAExcluded.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.c/osgi/lazystart/c/excluded/b/CBExcluded.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.c/osgi/lazystart/c/excluded/b/CBExcluded.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.c/osgi/lazystart/c/excluded/b/CBExcluded.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.c/osgi/lazystart/c/excluded/b/CBExcluded.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.d/osgi/lazystart/d/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.d/osgi/lazystart/d/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.d/osgi/lazystart/d/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.d/osgi/lazystart/d/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.d/osgi/lazystart/d/DTest.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.d/osgi/lazystart/d/DTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.d/osgi/lazystart/d/DTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.d/osgi/lazystart/d/DTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.e/osgi/lazystart/e/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.e/osgi/lazystart/e/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.e/osgi/lazystart/e/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/osgi.lazystart.e/osgi/lazystart/e/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/security.a/resources/HostManifest.properties 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/security.a/resources/HostManifest.properties --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/security.a/resources/HostManifest.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/security.a/resources/HostManifest.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2011 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/security.a/security/a/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/security.a/security/a/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/security.a/security/a/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/security.a/security/a/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/security.a.frag.a/resources/HostManifest_en_US.properties 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/security.a.frag.a/resources/HostManifest_en_US.properties --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/security.a.frag.a/resources/HostManifest_en_US.properties 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/security.a.frag.a/resources/HostManifest_en_US.properties 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2011 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/security.b/security/b/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/security.b/security/b/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/security.b/security/b/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/security.b/security/b/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ProSyst Software GmbH - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/storage.hooks.a/org/eclipse/osgi/tests/hooks/framework/storage/a/TestHookConfigurator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/storage.hooks.a/org/eclipse/osgi/tests/hooks/framework/storage/a/TestHookConfigurator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/storage.hooks.a/org/eclipse/osgi/tests/hooks/framework/storage/a/TestHookConfigurator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/storage.hooks.a/org/eclipse/osgi/tests/hooks/framework/storage/a/TestHookConfigurator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.a/substitutes/x/Ax.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.a/substitutes/x/Ax.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.a/substitutes/x/Ax.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.a/substitutes/x/Ax.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.a/substitutes/y/Ay.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.a/substitutes/y/Ay.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.a/substitutes/y/Ay.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.a/substitutes/y/Ay.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.a.frag/substitutes/q/AFq.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.a.frag/substitutes/q/AFq.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.a.frag/substitutes/q/AFq.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.a.frag/substitutes/q/AFq.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.b/substitutes/x/Bx.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.b/substitutes/x/Bx.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.b/substitutes/x/Bx.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.b/substitutes/x/Bx.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.b/substitutes/y/By.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.b/substitutes/y/By.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.b/substitutes/y/By.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.b/substitutes/y/By.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.b.frag/substitutes/q/BFq.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.b.frag/substitutes/q/BFq.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.b.frag/substitutes/q/BFq.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.b.frag/substitutes/q/BFq.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.e/substitutes/z/Ez.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.e/substitutes/z/Ez.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.e/substitutes/z/Ez.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.e/substitutes/z/Ez.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.f/substitutes/z/Fz.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.f/substitutes/z/Fz.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.f/substitutes/z/Fz.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.f/substitutes/z/Fz.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.i/substitutes/x/Ix.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.i/substitutes/x/Ix.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.i/substitutes/x/Ix.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.i/substitutes/x/Ix.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.i/substitutes/y/Iy.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.i/substitutes/y/Iy.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.i/substitutes/y/Iy.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.i/substitutes/y/Iy.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.j/substitutes/x/Jx.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.j/substitutes/x/Jx.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.j/substitutes/x/Jx.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.j/substitutes/x/Jx.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.j/substitutes/y/Jy.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.j/substitutes/y/Jy.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.j/substitutes/y/Jy.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.j/substitutes/y/Jy.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.k/substitutes/x/Kx.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.k/substitutes/x/Kx.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.k/substitutes/x/Kx.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.k/substitutes/x/Kx.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.k/substitutes/y/Ky.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.k/substitutes/y/Ky.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.k/substitutes/y/Ky.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.k/substitutes/y/Ky.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.l/substitutes/x/Lx.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.l/substitutes/x/Lx.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.l/substitutes/x/Lx.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.l/substitutes/x/Lx.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.l/substitutes/y/Ly.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.l/substitutes/y/Ly.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.l/substitutes/y/Ly.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.l/substitutes/y/Ly.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.m/substitutes/x/Mx.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.m/substitutes/x/Mx.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.m/substitutes/x/Mx.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.m/substitutes/x/Mx.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.m/substitutes/y/My.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.m/substitutes/y/My.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.m/substitutes/y/My.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.m/substitutes/y/My.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.n/substitutes/x/Nx.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.n/substitutes/x/Nx.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.n/substitutes/x/Nx.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.n/substitutes/x/Nx.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.n/substitutes/y/Ny.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.n/substitutes/y/Ny.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.n/substitutes/y/Ny.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/substitutes.n/substitutes/y/Ny.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test/test1/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test/test1/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test/test1/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test/test1/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug235958.x/test/bug235958/x/internal/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug235958.x/test/bug235958/x/internal/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug235958.x/test/bug235958/x/internal/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug235958.x/test/bug235958/x/internal/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug235958.x/test/bug235958/x/X1.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug235958.x/test/bug235958/x/X1.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug235958.x/test/bug235958/x/X1.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug235958.x/test/bug235958/x/X1.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug235958.y/test/bug235958/x/X.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug235958.y/test/bug235958/x/X.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug235958.y/test/bug235958/x/X.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug235958.y/test/bug235958/x/X.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug235958.y/test/bug235958/y/internal/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug235958.y/test/bug235958/y/internal/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug235958.y/test/bug235958/y/internal/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug235958.y/test/bug235958/y/internal/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug235958.y/test/bug235958/y/Y.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug235958.y/test/bug235958/y/Y.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug235958.y/test/bug235958/y/Y.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug235958.y/test/bug235958/y/Y.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug259903.a/test/bug259903/a/b/Service2.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug259903.a/test/bug259903/a/b/Service2.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug259903.a/test/bug259903/a/b/Service2.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug259903.a/test/bug259903/a/b/Service2.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug259903.a/test/bug259903/a/Service1.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug259903.a/test/bug259903/a/Service1.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug259903.a/test/bug259903/a/Service1.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug259903.a/test/bug259903/a/Service1.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug259903.b/test/bug259903/b/Service3.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug259903.b/test/bug259903/b/Service3.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug259903.b/test/bug259903/b/Service3.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug259903.b/test/bug259903/b/Service3.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug259903.c/test/bug259903/c/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug259903.c/test/bug259903/c/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug259903.c/test/bug259903/c/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug259903.c/test/bug259903/c/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug287750/test/bug287750/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug287750/test/bug287750/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug287750/test/bug287750/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug287750/test/bug287750/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug306181a/test/bug306181a/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug306181a/test/bug306181a/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug306181a/test/bug306181a/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug306181a/test/bug306181a/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug306181b/test/bug306181b/Component.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug306181b/test/bug306181b/Component.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug306181b/test/bug306181b/Component.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug306181b/test/bug306181b/Component.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug375784/test/bug375784/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug375784/test/bug375784/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug375784/test/bug375784/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug375784/test/bug375784/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug375784/test/bug375784/Test.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug375784/test/bug375784/Test.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug375784/test/bug375784/Test.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug375784/test/bug375784/Test.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug412228/test/bug412228/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug412228/test/bug412228/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug412228/test/bug412228/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug412228/test/bug412228/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug438904.frag/test/bug438904/frag/Test2.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug438904.frag/test/bug438904/frag/Test2.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug438904.frag/test/bug438904/frag/Test2.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug438904.frag/test/bug438904/frag/Test2.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug438904.host/test/bug438904/host/Test1.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug438904.host/test/bug438904/host/Test1.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug438904.host/test/bug438904/host/Test1.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug438904.host/test/bug438904/host/Test1.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug471551/test/bug471551/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug471551/test/bug471551/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug471551/test/bug471551/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug471551/test/bug471551/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,10 +1,13 @@ /******************************************************************************* * Copyright (c) 2015 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug490902.a/test/bug490902/a/A1.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug490902.a/test/bug490902/a/A1.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug490902.a/test/bug490902/a/A1.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug490902.a/test/bug490902/a/A1.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug490902.a/test/bug490902/a/TestLoadA1.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug490902.a/test/bug490902/a/TestLoadA1.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug490902.a/test/bug490902/a/TestLoadA1.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug490902.a/test/bug490902/a/TestLoadA1.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug490902.b/test/bug490902/b/B1.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug490902.b/test/bug490902/b/B1.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug490902.b/test/bug490902/b/B1.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.bug490902.b/test/bug490902/b/B1.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.dynamicimport/test/dynamicimport/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.dynamicimport/test/dynamicimport/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.dynamicimport/test/dynamicimport/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.dynamicimport/test/dynamicimport/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2015 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.filter.a/test/filter/a/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.filter.a/test/filter/a/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.filter.a/test/filter/a/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.filter.a/test/filter/a/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.link.a/test/link/a/params/AParam.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.link.a/test/link/a/params/AParam.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.link.a/test/link/a/params/AParam.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.link.a/test/link/a/params/AParam.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.link.a/test/link/a/SomeAPI.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.link.a/test/link/a/SomeAPI.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.link.a/test/link/a/SomeAPI.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.link.a/test/link/a/SomeAPI.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.link.a.client/test/link/a/client/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.link.a.client/test/link/a/client/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.link.a.client/test/link/a/client/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.link.a.client/test/link/a/client/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.logging.a/test/logging/a/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.logging.a/test/logging/a/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.logging.a/test/logging/a/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.logging.a/test/logging/a/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/a/A.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/a/A.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/a/A.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/a/A.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/b/B.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/b/B.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/b/B.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/b/B.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/c/C.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/c/C.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/c/C.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/c/C.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/d/D.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/d/D.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/d/D.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/d/D.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/e/E.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/e/E.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/e/E.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/e/E.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/f/F.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/f/F.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/f/F.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/f/F.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.protocol.handler/test/protocol/handler/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.protocol.handler/test/protocol/handler/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.protocol.handler/test/protocol/handler/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.protocol.handler/test/protocol/handler/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2015 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.tccl/test/tccl/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.tccl/test/tccl/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.tccl/test/tccl/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.tccl/test/tccl/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.uninstall.start1/test/uninstall/start1/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.uninstall.start1/test/uninstall/start1/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.uninstall.start1/test/uninstall/start1/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.uninstall.start1/test/uninstall/start1/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.uninstall.start2/test/uninstall/start2/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.uninstall.start2/test/uninstall/start2/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/test.uninstall.start2/test/uninstall/start2/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/test.uninstall.start2/test/uninstall/start2/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/thread.locktest/thread/locktest/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/thread.locktest/thread/locktest/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/thread.locktest/thread/locktest/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/thread.locktest/thread/locktest/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/thread.locktest/thread/locktest/ATest.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/thread.locktest/thread/locktest/ATest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/thread.locktest/thread/locktest/ATest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/thread.locktest/thread/locktest/ATest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/thread.locktest/thread/locktest/Class1.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/thread.locktest/thread/locktest/Class1.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/thread.locktest/thread/locktest/Class1.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/thread.locktest/thread/locktest/Class1.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/wrapper.hooks.a/org/eclipse/osgi/tests/wrapper/hooks/a/TestHookConfigurator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/wrapper.hooks.a/org/eclipse/osgi/tests/wrapper/hooks/a/TestHookConfigurator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/wrapper.hooks.a/org/eclipse/osgi/tests/wrapper/hooks/a/TestHookConfigurator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/wrapper.hooks.a/org/eclipse/osgi/tests/wrapper/hooks/a/TestHookConfigurator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2015, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/xfriends.test1/xfriends/test1/external/TestFriends.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/xfriends.test1/xfriends/test1/external/TestFriends.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/xfriends.test1/xfriends/test1/external/TestFriends.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/xfriends.test1/xfriends/test1/external/TestFriends.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/xfriends.test1/xfriends/test1/onlyforfriends/TestFriends.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/xfriends.test1/xfriends/test1/onlyforfriends/TestFriends.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/xfriends.test1/xfriends/test1/onlyforfriends/TestFriends.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/xfriends.test1/xfriends/test1/onlyforfriends/TestFriends.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/xfriends.test2/xfriends/test2/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/xfriends.test2/xfriends/test2/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/xfriends.test2/xfriends/test2/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/xfriends.test2/xfriends/test2/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/xfriends.test3/xfriends/test3/Activator.java 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/xfriends.test3/xfriends/test3/Activator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/bundles_src/xfriends.test3/xfriends/test3/Activator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/bundles_src/xfriends.test3/xfriends/test3/Activator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.osgi.tests/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.osgi.tests/META-INF/MANIFEST.MF 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/META-INF/MANIFEST.MF 2018-08-27 15:36:00.000000000 +0000 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Core OSGi Tests Bundle-SymbolicName: org.eclipse.osgi.tests;singleton:=true -Bundle-Version: 3.13.0.qualifier +Bundle-Version: 3.13.100.qualifier Bundle-Vendor: Eclipse.org Bundle-Localization: plugin Require-Bundle: diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/pom.xml 4.9-1/bundles/org.eclipse.osgi.tests/pom.xml --- 4.8-1/bundles/org.eclipse.osgi.tests/pom.xml 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/pom.xml 2018-08-27 15:36:00.000000000 +0000 @@ -14,12 +14,12 @@ rt.equinox.framework org.eclipse.equinox.framework - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.osgi org.eclipse.osgi.tests - 3.13.0-SNAPSHOT + 3.13.100-SNAPSHOT eclipse-test-plugin diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/profile.list 4.9-1/bundles/org.eclipse.osgi.tests/profile.list --- 4.8-1/bundles/org.eclipse.osgi.tests/profile.list 1970-01-01 00:00:00.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/profile.list 2018-08-27 15:36:00.000000000 +0000 @@ -0,0 +1,31 @@ +############################################################################### +# Copyright (c) 2003, 2013 IBM Corporation and others. +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 +# which accompanies this distribution, and is available at +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +java.profiles = \ + JavaSE-9.profile,\ + JavaSE-1.8.profile,\ + JavaSE-1.7.profile,\ + JavaSE-1.6.profile,\ + J2SE-1.5.profile,\ + J2SE-1.4.profile,\ + J2SE-1.3.profile,\ + J2SE-1.2.profile,\ + JRE-1.1.profile,\ + JavaSE_compact1-1.8.profile,\ + JavaSE_compact2-1.8.profile,\ + JavaSE_compact3-1.8.profile,\ + CDC-1.1_Foundation-1.1.profile,\ + CDC-1.0_Foundation-1.0.profile,\ + OSGi_Minimum-1.0.profile,\ + OSGi_Minimum-1.1.profile,\ + OSGi_Minimum-1.2.profile diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllExtendedLogServiceTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllExtendedLogServiceTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllExtendedLogServiceTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllExtendedLogServiceTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2011 Cognos Incorporated, IBM Corporation and others - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Eclipse Public License v1.0 which + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 which * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 ******************************************************************************/ package org.eclipse.equinox.log.test; diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllLogServiceTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllLogServiceTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllLogServiceTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllLogServiceTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2011 Cognos Incorporated, IBM Corporation and others - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Eclipse Public License v1.0 which + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 which * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 ******************************************************************************/ package org.eclipse.equinox.log.test; diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,8 +1,12 @@ /******************************************************************************* - * Copyright (c) 2007, 2011 IBM Corporation and others All rights reserved. This +s +s This * program and the accompanying materials are made available under the terms of - * the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html + * the Eclipse Public License 2.0 which accompanies this distribution, and is + * available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: IBM Corporation - initial API and implementation *******************************************************************************/ diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogReaderServiceTest.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogReaderServiceTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogReaderServiceTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogReaderServiceTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2015 Cognos Incorporated, IBM Corporation and others - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Eclipse Public License v1.0 which + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 which * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 ******************************************************************************/ package org.eclipse.equinox.log.test; diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogServiceTest.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogServiceTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogServiceTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogServiceTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,8 +1,12 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 IBM Corporation and others All rights reserved. This +s +s This * program and the accompanying materials are made available under the terms of - * the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html + * the Eclipse Public License 2.0 which accompanies this distribution, and is + * available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: IBM Corporation - initial API and implementation *******************************************************************************/ diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogPermissionCollectionTest.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogPermissionCollectionTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogPermissionCollectionTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogPermissionCollectionTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2011 Cognos Incorporated, IBM Corporation and others - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Eclipse Public License v1.0 which + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 which * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 ******************************************************************************/ package org.eclipse.equinox.log.test; diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,24 +1,49 @@ /******************************************************************************* - * Copyright (c) 2007, 2014 IBM Corporation and others All rights reserved. This +s +s This * program and the accompanying materials are made available under the terms of - * the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html + * the Eclipse Public License 2.0 which accompanies this distribution, and is + * available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.equinox.log.test; import java.io.File; -import java.util.*; -import java.util.concurrent.*; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; +import org.eclipse.equinox.log.ExtendedLogEntry; +import org.eclipse.equinox.log.SynchronousLogListener; import org.eclipse.osgi.container.Module; import org.eclipse.osgi.container.ModuleContainerAdaptor.ContainerEvent; import org.eclipse.osgi.internal.framework.EquinoxConfiguration; import org.eclipse.osgi.launch.Equinox; import org.eclipse.osgi.tests.OSGiTestsActivator; import org.eclipse.osgi.tests.bundles.AbstractBundleTests; -import org.osgi.framework.*; -import org.osgi.service.log.*; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleEvent; +import org.osgi.framework.BundleException; +import org.osgi.framework.Constants; +import org.osgi.framework.FrameworkEvent; +import org.osgi.framework.ServiceEvent; +import org.osgi.framework.ServiceReference; +import org.osgi.framework.ServiceRegistration; +import org.osgi.service.log.LogEntry; +import org.osgi.service.log.LogLevel; +import org.osgi.service.log.LogListener; +import org.osgi.service.log.LogReaderService; +import org.osgi.service.log.LogService; +import org.osgi.service.log.Logger; import org.osgi.service.log.admin.LoggerAdmin; import org.osgi.service.log.admin.LoggerContext; @@ -134,7 +159,29 @@ public class LogReaderServiceTest extend testBundle.start(); listener.waitForLogEntry(); } - assertTrue(listener.getEntryX().getLevel() == LogService.LOG_INFO); + + ExtendedLogEntry entry = listener.getEntryX(); + assertTrue(entry.getLevel() == LogService.LOG_INFO); + assertEquals("Wrong level.", LogLevel.INFO, entry.getLogLevel()); + assertTrue("Wrong context: " + entry.getContext(), entry.getContext() instanceof BundleEvent); + } + + public void testLogBundleEventSynchronous() throws Exception { + // this is just a bundle that is harmless to start/stop + final Bundle testBundle = installer.installBundle("test.logging.a"); //$NON-NLS-1$ + final AtomicReference logThread = new AtomicReference<>(); + LogListener listener = new SynchronousLogListener() { + @Override + public void logged(LogEntry entry) { + if (entry.getBundle() == testBundle) { + logThread.compareAndSet(null, Thread.currentThread()); + } + } + }; + reader.addLogListener(listener); + testBundle.start(); + + assertEquals("Wrong thread for synchronous bundle event logs.", Thread.currentThread(), logThread.get()); } public void testLogServiceEventInfo() throws Exception { @@ -144,7 +191,10 @@ public class LogReaderServiceTest extend OSGiTestsActivator.getContext().registerService(Object.class.getName(), new Object(), null); listener.waitForLogEntry(); } - assertTrue(listener.getEntryX().getLevel() == LogService.LOG_INFO); + ExtendedLogEntry entry = listener.getEntryX(); + assertTrue(entry.getLevel() == LogService.LOG_INFO); + assertEquals("Wrong level.", LogLevel.INFO, entry.getLogLevel()); + assertTrue("Wrong context: " + entry.getContext(), entry.getContext() instanceof ServiceEvent); } public void testLogServiceEventDebug() throws Exception { @@ -156,18 +206,34 @@ public class LogReaderServiceTest extend registration.setProperties(new Hashtable()); listener.waitForLogEntry(); } - assertTrue(listener.getEntryX().getLevel() == LogService.LOG_DEBUG); + ExtendedLogEntry entry = listener.getEntryX(); + assertTrue(entry.getLevel() == LogService.LOG_DEBUG); + assertEquals("Wrong level.", LogLevel.DEBUG, entry.getLogLevel()); + assertTrue("Wrong context: " + entry.getContext(), entry.getContext() instanceof ServiceEvent); } public void testLogFrameworkEvent() throws Exception { Bundle testBundle = installer.installBundle("test.logging.a"); //$NON-NLS-1$ - TestListener listener = new TestListener(testBundle); + final AtomicReference logEntry = new AtomicReference<>(); + final CountDownLatch countDown = new CountDownLatch(1); + LogListener listener = new LogListener() { + @Override + public void logged(LogEntry entry) { + if ("Events.Framework".equals(entry.getLoggerName())) { + logEntry.set(entry); + countDown.countDown(); + } + } + }; reader.addLogListener(listener); - synchronized (listener) { - installer.refreshPackages(new Bundle[] {testBundle}); - listener.waitForLogEntry(); - } - assertTrue(listener.getEntryX().getLevel() == LogService.LOG_INFO); + installer.refreshPackages(new Bundle[] {testBundle}); + + countDown.await(5, TimeUnit.SECONDS); + + ExtendedLogEntry entry = (ExtendedLogEntry) logEntry.get(); + assertTrue(entry.getLevel() == LogService.LOG_INFO); + assertEquals("Wrong level.", LogLevel.INFO, entry.getLogLevel()); + assertTrue("Wrong context: " + entry.getContext(), entry.getContext() instanceof FrameworkEvent); } public void testLogFrameworkEventType() throws Exception { diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogServiceTest.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogServiceTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogServiceTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogServiceTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,8 +1,12 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 IBM Corporation and others All rights reserved. This +s +s This * program and the accompanying materials are made available under the terms of - * the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html + * the Eclipse Public License 2.0 which accompanies this distribution, and is + * available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: IBM Corporation - initial API and implementation *******************************************************************************/ diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener2.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener2.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener2.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener2.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2017 Cognos Incorporated, IBM Corporation and others - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Eclipse Public License v1.0 which + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 which * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 ******************************************************************************/ package org.eclipse.equinox.log.test; diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,8 +1,12 @@ /******************************************************************************* - * Copyright (c) 2007, 2013 IBM Corporation All rights reserved. This program +n +n This program * and the accompanying materials are made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html + * Eclipse Public License 2.0 which accompanies this distribution, and is + * available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ package org.eclipse.equinox.log.test; @@ -25,10 +29,10 @@ class TestListener implements LogListene this.testBundle = testBundle == null ? OSGiTestsActivator.getContext().getBundle() : testBundle; } - public synchronized void logged(LogEntry entry) { - if (!testBundle.equals(entry.getBundle())) + public synchronized void logged(LogEntry e) { + if (!testBundle.equals(e.getBundle())) return; // discard logs from all other bundles - this.entry = entry; + this.entry = e; notifyAll(); } diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/AllTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/AllTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/AllTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/AllTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ApplicationAdminTest.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ApplicationAdminTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ApplicationAdminTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ApplicationAdminTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2014 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ExitValueApp.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ExitValueApp.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ExitValueApp.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ExitValueApp.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/FailedApp.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/FailedApp.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/FailedApp.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/FailedApp.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/SimpleApp.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/SimpleApp.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/SimpleApp.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/SimpleApp.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/AutomatedTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/AutomatedTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/AutomatedTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/AutomatedTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/AbstractBundleTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/AbstractBundleTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/AbstractBundleTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/AbstractBundleTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 20010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ArrayTest.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ArrayTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ArrayTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ArrayTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleExceptionTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleExceptionTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleExceptionTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleExceptionTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleInstaller.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleInstaller.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleInstaller.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleInstaller.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleInstallUpdateTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleInstallUpdateTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleInstallUpdateTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleInstallUpdateTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,22 +1,41 @@ /******************************************************************************* - * Copyright (c) 2009, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * Copyright (c) 2009, 2018 IBM Corporation and others. + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.osgi.tests.bundles; -import java.io.*; -import java.net.*; -import java.util.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URISyntaxException; +import java.net.URL; +import java.net.URLEncoder; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; import junit.framework.Test; import junit.framework.TestSuite; +import org.eclipse.core.runtime.Platform; +import org.eclipse.osgi.service.urlconversion.URLConverter; import org.eclipse.osgi.tests.OSGiTestsActivator; -import org.osgi.framework.*; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleException; +import org.osgi.framework.Constants; +import org.osgi.framework.InvalidSyntaxException; +import org.osgi.framework.ServiceRegistration; import org.osgi.framework.hooks.bundle.CollisionHook; public class BundleInstallUpdateTests extends AbstractBundleTests { @@ -290,46 +309,94 @@ public class BundleInstallUpdateTests ex } } - public void testPercentLocation() throws BundleException, IOException { + public void testPercentLocation() { doTestSpecialChars('%', false); doTestSpecialChars('%', true); } - public void testSpaceLocation() throws BundleException, IOException { + public void testSpaceLocation() { doTestSpecialChars(' ', false); doTestSpecialChars(' ', true); } - private void doTestSpecialChars(char c, boolean encode) throws BundleException, IOException { + public void testPlusLocation() { + doTestSpecialChars('+', true); + doTestSpecialChars('+', false); + } + + public void testOctothorpLocation() { + doTestSpecialChars('#', true); + // # must be encoded for anything to pass + doTestSpecialChars('#', false, false, false); + } + + public void testQuestionMarkLocation() { + if (Platform.getOS().equals(Platform.OS_WIN32)) { + // Skip this test on windows + return; + } + doTestSpecialChars('?', true); + // ? must only be encoded for non-reference installs + doTestSpecialChars('?', false, true, false); + + } + + private void doTestSpecialChars(char c, boolean encode) { + doTestSpecialChars(c, encode, true, true); + } + + private void doTestSpecialChars(char c, boolean encode, boolean refPass, boolean filePass) { File bundlesDirectory = OSGiTestsActivator.getContext().getDataFile("file_with_" + c + "_char"); bundlesDirectory.mkdirs(); - File testBundleJarFile = SystemBundleTests.createBundle(bundlesDirectory, getName() + 1, false, false); - @SuppressWarnings("deprecation") - String testBundleJarFileURL = encode ? testBundleJarFile.toURI().toString() : testBundleJarFile.toURL().toString(); - File testBundleDirFile = SystemBundleTests.createBundle(bundlesDirectory, getName() + 2, false, true); - @SuppressWarnings("deprecation") - String testBundleDirFileURL = encode ? testBundleDirFile.toURI().toString() : testBundleDirFile.toURL().toString(); + File testBundleJarFile = null; + String testBundleJarFileURL = null; + File testBundleDirFile = null; + String testBundleDirFileURL = null; + try { + testBundleJarFile = SystemBundleTests.createBundle(bundlesDirectory, getName() + 1, false, false); + testBundleJarFileURL = encode ? testBundleJarFile.toURI().toString() : testBundleJarFile.toURL().toString(); + testBundleDirFile = SystemBundleTests.createBundle(bundlesDirectory, getName() + 2, false, true); + testBundleDirFileURL = encode ? testBundleDirFile.toURI().toString() : testBundleDirFile.toURL().toString(); + } catch (IOException e) { + fail(e.getMessage()); + } + + String refToJarURL = "reference:" + testBundleJarFileURL; + // Test with reference stream to jar bundle + testInstallSpecialCharBundle(refToJarURL, true, refPass); // Test with reference URL to jar bundle - Bundle testBundleJarRef = getContext().installBundle("reference:" + testBundleJarFileURL); - testBundleJarRef.start(); - testBundleJarRef.uninstall(); + testInstallSpecialCharBundle(refToJarURL, false, refPass); // Test with reference URL to dir bundle - Bundle testBundleDirRef = getContext().installBundle("reference:" + testBundleDirFileURL); - testBundleDirRef.start(); - testBundleDirRef.uninstall(); + testInstallSpecialCharBundle("reference:" + testBundleDirFileURL, false, refPass); // Test with jar bundle - Bundle testBundleJar = getContext().installBundle(testBundleJarFileURL); - testBundleJar.start(); - testBundleJar.uninstall(); + testInstallSpecialCharBundle(testBundleJarFileURL, false, filePass); // Test with dir bundle - Bundle testBundleDir = getContext().installBundle(testBundleDirFileURL); - testBundleDir.start(); - testBundleDir.uninstall(); + testInstallSpecialCharBundle(testBundleDirFileURL, false, filePass); + } + + void testInstallSpecialCharBundle(String location, boolean openStream, boolean expectSuccess) { + try { + Bundle b; + if (openStream) { + b = getContext().installBundle(location, new URL(location).openStream()); + } else { + b = getContext().installBundle(location); + } + b.start(); + b.uninstall(); + if (!expectSuccess) { + fail("Should have failed for location: " + location); + } + } catch (Exception e) { + if (expectSuccess) { + fail("Should not have failed for location: " + location + " " + e.getMessage()); + } + } } public void testPercentCharBundleEntry() throws IOException, BundleException { @@ -367,4 +434,49 @@ public class BundleInstallUpdateTests ex is = encodedURL.openStream(); is.close(); } + + public void testEscapeZipRoot() throws IOException, BundleException, InvalidSyntaxException, URISyntaxException { + String entry1 = "../../escapedZipRoot1.txt"; + String entry2 = "dir1/../../../escapedZipRoot2.txt"; + String cp1 = "../../cp.jar"; + File bundlesDirectory = OSGiTestsActivator.getContext().getDataFile(getName()); + bundlesDirectory.mkdirs(); + Map headers = new HashMap(); + headers.put(Constants.BUNDLE_MANIFESTVERSION, "2"); + headers.put(Constants.BUNDLE_SYMBOLICNAME, getName()); + headers.put(Constants.BUNDLE_CLASSPATH, "., ../../cp.jar"); + Map entries = new HashMap<>(); + entries.put(entry1, "value"); + entries.put(entry2, "value"); + entries.put(cp1, "value"); + + File testBundleJarFile = SystemBundleTests.createBundle(bundlesDirectory, getName(), headers, entries); + Bundle testBundle = getContext().installBundle(getName(), new FileInputStream(testBundleJarFile)); + testBundle.start(); + try { + testBundle.loadClass("does.not.exist.Test"); + } catch (ClassNotFoundException e) { + // expected + } + URLConverter bundleURLConverter = getContext().getService(getContext().getServiceReferences(URLConverter.class, "(protocol=bundleentry)").iterator().next()); + + URL dir1 = bundleURLConverter.toFileURL(testBundle.getEntry("dir1/")); + File dir1File = new File(dir1.toExternalForm().substring(5)); + + File dir1EscapedFile2 = new File(dir1File, entry2.substring("dir1".length())); + assertFalse("File escaped zip root: " + dir1EscapedFile2.getCanonicalPath(), dir1EscapedFile2.exists()); + + URL root = bundleURLConverter.toFileURL(testBundle.getEntry("/")); + File rootFile = new File(root.toExternalForm().substring(5)); + + File rootEscapedFile1 = new File(rootFile, entry1); + assertFalse("File escaped zip root: " + rootEscapedFile1.getCanonicalPath(), rootEscapedFile1.exists()); + + File rootEscapedFile2 = new File(rootFile, entry2); + assertFalse("File escaped zip root: " + rootEscapedFile2.getCanonicalPath(), rootEscapedFile2.exists()); + + File rootEscapedFile3 = new File(rootFile, cp1); + assertFalse("File escaped zip root: " + rootEscapedFile3.getCanonicalPath(), rootEscapedFile3.exists()); + + } } diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleResourceTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleResourceTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleResourceTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleResourceTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2018 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/CascadeConfigTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/CascadeConfigTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/CascadeConfigTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/CascadeConfigTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ClassLoadingBundleTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ClassLoadingBundleTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ClassLoadingBundleTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ClassLoadingBundleTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2018 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -32,16 +35,11 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicBoolean; -import javax.jws.WebService; -import javax.xml.namespace.QName; -import javax.xml.ws.Endpoint; -import javax.xml.ws.Service; import junit.framework.AssertionFailedError; import junit.framework.Test; import junit.framework.TestSuite; +import org.eclipse.osgi.internal.loader.BundleLoader; import org.eclipse.osgi.internal.loader.ModuleClassLoader; import org.eclipse.osgi.tests.OSGiTestsActivator; import org.osgi.framework.Bundle; @@ -52,7 +50,6 @@ import org.osgi.framework.BundleReferenc import org.osgi.framework.Constants; import org.osgi.framework.FrameworkEvent; import org.osgi.framework.FrameworkUtil; -import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceFactory; import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; @@ -1735,76 +1732,22 @@ public class ClassLoadingBundleTests ext global.loadClass("test.bug438904.frag.Test2"); } - public void testContextFinderGetResource() throws IOException, InvalidSyntaxException { - // get the context finder explicitly to test incase the thread context class loader has changed - ClassLoader contextFinder = getContext().getService(getContext().getServiceReferences(ClassLoader.class, "(equinox.classloader.type=contextClassLoader)").iterator().next()); - // Using a resource we know is in java 8. - String resource = "META-INF/services/javax.print.PrintServiceLookup"; - URL systemURL = ClassLoader.getSystemClassLoader().getResource(resource); - assertNotNull("Did not find a parent resource: " + resource, systemURL); - //should return the file defined in test bundle. - URL url = contextFinder.getResource(resource); - //the first element should be the file define in this bundle. - List urls = Collections.list(contextFinder.getResources(resource)); - // make sure we have a resource located in the parent - assertTrue("Did not find a parent resource: " + urls, urls.size() > 1); - //assert failed as it return the one defined in parent class. - assertEquals(url.toExternalForm(), urls.get(0).toExternalForm()); - } - - @WebService(endpointInterface = "org.eclipse.osgi.tests.bundles.TestService") - public static class TestServiceImpl implements TestService { - - @Override - public String hello(final String name) { - return "Hello " + name; - } - - } - - /* - * This test depends on the behavior of the JVM Endpoint implementation to use - * the context class loader to try and find resources using an executor. - * This is important because it causes the thread stack to have NO classes - * loaded by a bundle class loader. This causes a condition that would - * make ContextFinder.getResources to return null - */ - public void testContextFinderEmptyGetResources() throws Exception { - // get the context finder explicitly to test incase the thread context class loader has changed - ClassLoader contextFinder = getContext().getService(getContext().getServiceReferences(ClassLoader.class, "(equinox.classloader.type=contextClassLoader)").iterator().next()); - ClassLoader previousTCCL = Thread.currentThread().getContextClassLoader(); - Thread.currentThread().setContextClassLoader(contextFinder); - ExecutorService pool = null; - try { - pool = Executors.newFixedThreadPool(3); - - final String address = "http://localhost:23512/service"; - - final WebService annotation = TestService.class.getAnnotation(WebService.class); - final String namespaceURI = annotation.serviceName(); - final String localPart = annotation.targetNamespace(); - final QName serviceName = new QName(namespaceURI, localPart); - - final TestServiceImpl tsi = new TestServiceImpl(); - final Endpoint endpoint = Endpoint.create(tsi); - final HashMap props = new HashMap(); - props.put(Endpoint.WSDL_SERVICE, serviceName); - - endpoint.setProperties(props); - endpoint.setExecutor(pool); - endpoint.publish(address); - final URL wsdlURL = new URL(address + "?wsdl"); - final Service s = Service.create(wsdlURL, serviceName); - assertNotNull("Service is null.", s); - final TestService port = s.getPort(TestService.class); - - assertEquals("Wrong result.", "Hello World", port.hello("World")); - } finally { - Thread.currentThread().setContextClassLoader(previousTCCL); - if (pool != null) { - pool.shutdown(); - } - } + public void testUnitTestForcompoundEnumerations() { + Enumeration result = BundleLoader.compoundEnumerations(null, Collections.emptyEnumeration()); + assertNotNull("Null result.", result); + assertFalse("Found elements.", result.hasMoreElements()); + + result = BundleLoader.compoundEnumerations(Collections.emptyEnumeration(), null); + assertNotNull("Null result.", result); + assertFalse("Found elements.", result.hasMoreElements()); + + result = BundleLoader.compoundEnumerations(null, null); + assertNotNull("Null result.", result); + assertFalse("Found elements.", result.hasMoreElements()); + + result = BundleLoader.compoundEnumerations(Collections.emptyEnumeration(), Collections.emptyEnumeration()); + assertNotNull("Null result.", result); + assertFalse("Found elements.", result.hasMoreElements()); } public void testBundleClassLoaderEmptyGetResources() throws Exception { diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/DiscardBundleTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/DiscardBundleTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/DiscardBundleTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/DiscardBundleTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/EventListenerTestResults.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/EventListenerTestResults.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/EventListenerTestResults.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/EventListenerTestResults.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ExtensionBundleTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ExtensionBundleTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ExtensionBundleTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ExtensionBundleTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ImportJavaSEPackagesTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ImportJavaSEPackagesTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ImportJavaSEPackagesTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ImportJavaSEPackagesTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2018 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ITestRunner.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ITestRunner.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ITestRunner.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ITestRunner.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/LoggingTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/LoggingTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/LoggingTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/LoggingTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/MultiReleaseJarTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/MultiReleaseJarTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/MultiReleaseJarTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/MultiReleaseJarTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/NativeCodeBundleTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/NativeCodeBundleTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/NativeCodeBundleTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/NativeCodeBundleTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/PackageAdminBundleTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/PackageAdminBundleTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/PackageAdminBundleTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/PackageAdminBundleTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/PersistedBundleTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/PersistedBundleTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/PersistedBundleTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/PersistedBundleTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/PlatformAdminBundleTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/PlatformAdminBundleTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/PlatformAdminBundleTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/PlatformAdminBundleTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SubstituteExportsBundleTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SubstituteExportsBundleTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SubstituteExportsBundleTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SubstituteExportsBundleTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SyncEventListenerTestResults.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SyncEventListenerTestResults.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SyncEventListenerTestResults.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SyncEventListenerTestResults.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2018 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -96,11 +99,13 @@ import org.osgi.framework.hooks.weaving. import org.osgi.framework.launch.Framework; import org.osgi.framework.launch.FrameworkFactory; import org.osgi.framework.namespace.NativeNamespace; +import org.osgi.framework.namespace.PackageNamespace; import org.osgi.framework.startlevel.BundleStartLevel; import org.osgi.framework.startlevel.FrameworkStartLevel; import org.osgi.framework.wiring.BundleCapability; import org.osgi.framework.wiring.BundleRequirement; import org.osgi.framework.wiring.BundleRevision; +import org.osgi.framework.wiring.BundleWire; import org.osgi.framework.wiring.BundleWiring; import org.osgi.framework.wiring.FrameworkWiring; import org.osgi.resource.Capability; @@ -3763,4 +3768,92 @@ public class SystemBundleTests extends A } } + public void testContextFinderGetResource() throws IOException, InvalidSyntaxException { + File config = OSGiTestsActivator.getContext().getDataFile(getName()); //$NON-NLS-1$ + Map configuration = new HashMap(); + configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath()); + configuration.put(EquinoxConfiguration.PROP_CONTEXTCLASSLOADER_PARENT, EquinoxConfiguration.CONTEXTCLASSLOADER_PARENT_FWK); + Equinox equinox = null; + try { + equinox = new Equinox(configuration); + equinox.init(); + BundleContext bc = equinox.getBundleContext(); + // get the context finder explicitly to test + ClassLoader contextFinder = bc.getService(bc.getServiceReferences(ClassLoader.class, "(equinox.classloader.type=contextClassLoader)").iterator().next()); + // Using a resource we know is in the framework + String resource = "profile.list"; + URL fwkURL = Bundle.class.getClassLoader().getResource(resource); + assertNotNull("Did not find a parent resource: " + resource, fwkURL); + // should return the file defined in test bundle. + URL url = contextFinder.getResource(resource); + // the first element should be the file define in this bundle. + List urls = Collections.list(contextFinder.getResources(resource)); + // make sure we have a resource located in the parent + assertTrue("Did not find a parent resource: " + urls, urls.size() > 1); + // assert failed as it return the one defined in parent class. + assertEquals(url.toExternalForm(), urls.get(0).toExternalForm()); + } catch (BundleException e) { + fail("Failed init", e); + } finally { + try { + if (equinox != null) { + equinox.stop(); + equinox.waitForStop(1000); + } + } catch (BundleException e) { + fail("Failed to stop framework.", e); + } catch (InterruptedException e) { + fail("Failed to stop framework.", e); + } + } + } + + public void testDynamicImportFromSystemBundle() throws IOException { + File config = OSGiTestsActivator.getContext().getDataFile(getName()); //$NON-NLS-1$ + Map configuration = new HashMap(); + configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath()); + configuration.put(Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA, "some.system.pkg"); + Equinox equinox = null; + try { + equinox = new Equinox(configuration); + equinox.init(); + BundleContext bc = equinox.getBundleContext(); + + Map h2 = new HashMap(); + h2.put(Constants.BUNDLE_MANIFESTVERSION, "2"); + h2.put(Constants.BUNDLE_SYMBOLICNAME, getName() + ".dynamicimporter"); + h2.put(Constants.DYNAMICIMPORT_PACKAGE, "some.system.*; version=1.0"); + File f2 = SystemBundleTests.createBundle(config, getName() + ".importer", h2); + Bundle b2 = bc.installBundle("reference:file:///" + f2.getAbsolutePath()); //$NON-NLS-1$ + b2.getResource("does/not/exist.txt"); + + Map h1 = new HashMap(); + h1.put(Constants.BUNDLE_MANIFESTVERSION, "2"); + h1.put(Constants.BUNDLE_SYMBOLICNAME, getName() + ".exporter"); + h1.put(Constants.EXPORT_PACKAGE, "some.system.pkg; version=1.0"); + File f1 = SystemBundleTests.createBundle(config, getName() + ".exporter", h1); + Bundle b1 = bc.installBundle("reference:file:///" + f1.getAbsolutePath()); //$NON-NLS-1$ + + b2.getResource("some/system/pkg/Test"); + + BundleWiring w = b2.adapt(BundleWiring.class); + assertNotNull("Null wiring.", w); + List pkgWires = w.getRequiredWires(PackageNamespace.PACKAGE_NAMESPACE); + assertFalse("Empty wires.", pkgWires.isEmpty()); + assertEquals("Wrong provider", b1.adapt(BundleRevision.class), pkgWires.iterator().next().getProvider()); + } catch (BundleException e) { + fail("Unexpected BundleException", e); + } finally { + try { + if (equinox != null) { + equinox.stop(); + equinox.waitForStop(1000); + } + } catch (BundleException e) { + fail("Failed to stop framework.", e); + } catch (InterruptedException e) { + fail("Failed to stop framework.", e); + } + } + } } diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/TestResults.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/TestResults.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/TestResults.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/TestResults.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/TestService.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/TestService.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/TestService.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/TestService.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.osgi.tests.bundles; - -import javax.jws.WebService; - -@WebService(serviceName = "Foo", targetNamespace = "http://bar") -public interface TestService { - String hello(String name); -} diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/URLHandlerTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/URLHandlerTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/URLHandlerTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/URLHandlerTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2015, 2018 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/AllTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/AllTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/AllTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/AllTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2015 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/EclipseStarterConfigIniTest.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/EclipseStarterConfigIniTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/EclipseStarterConfigIniTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/EclipseStarterConfigIniTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2015 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/EclipseStarterConfigurationAreaTest.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/EclipseStarterConfigurationAreaTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/EclipseStarterConfigurationAreaTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/EclipseStarterConfigurationAreaTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/MovableConfigurationAreaTest.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/MovableConfigurationAreaTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/MovableConfigurationAreaTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/MovableConfigurationAreaTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/ReadOnlyConfigurationAreaTest.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/ReadOnlyConfigurationAreaTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/ReadOnlyConfigurationAreaTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/ReadOnlyConfigurationAreaTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/AbstractTest.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/AbstractTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/AbstractTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/AbstractTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/AllTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/AllTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/AllTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/AllTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyCollisionHook.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyCollisionHook.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyCollisionHook.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyCollisionHook.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyContainerAdaptor.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyContainerAdaptor.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyContainerAdaptor.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyContainerAdaptor.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyDebugOptions.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyDebugOptions.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyDebugOptions.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyDebugOptions.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2015 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyModuleDatabase.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyModuleDatabase.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyModuleDatabase.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyModuleDatabase.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyModule.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyModule.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyModule.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyModule.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummySystemModule.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummySystemModule.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummySystemModule.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummySystemModule.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/UnresolvedProviderEntryBuilder.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/UnresolvedProviderEntryBuilder.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/UnresolvedProviderEntryBuilder.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/UnresolvedProviderEntryBuilder.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/ResolutionReportTest.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/ResolutionReportTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/ResolutionReportTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/ResolutionReportTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2014 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/TestModuleContainer.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/TestModuleContainer.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/TestModuleContainer.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/TestModuleContainer.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/debugoptions/DebugOptionsTestCase.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/debugoptions/DebugOptionsTestCase.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/debugoptions/DebugOptionsTestCase.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/debugoptions/DebugOptionsTestCase.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2014 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/AllTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/AllTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/AllTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/AllTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2014 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/EnvironmentInfoTest.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/EnvironmentInfoTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/EnvironmentInfoTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/EnvironmentInfoTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/FilePathTest.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/FilePathTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/FilePathTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/FilePathTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eventmgr/EventManagerTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eventmgr/EventManagerTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eventmgr/EventManagerTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eventmgr/EventManagerTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/filter/BundleContextFilterTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/filter/BundleContextFilterTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/filter/BundleContextFilterTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/filter/BundleContextFilterTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/filter/FilterTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/filter/FilterTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/filter/FilterTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/filter/FilterTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/filter/FrameworkUtilFilterTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/filter/FrameworkUtilFilterTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/filter/FrameworkUtilFilterTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/filter/FrameworkUtilFilterTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/AbstractFrameworkHookTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/AbstractFrameworkHookTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/AbstractFrameworkHookTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/AbstractFrameworkHookTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2014 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/AllFrameworkHookTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/AllFrameworkHookTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/AllFrameworkHookTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/AllFrameworkHookTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2015 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -19,6 +22,7 @@ public class AllFrameworkHookTests { suite.addTest(new TestSuite(StorageHookTests.class)); suite.addTest(new TestSuite(ClassLoaderHookTests.class)); suite.addTest(new TestSuite(BundleFileWrapperFactoryHookTests.class)); + suite.addTest(new TestSuite(ContextFinderTests.class)); return suite; } } diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/BundleFileWrapperFactoryHookTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/BundleFileWrapperFactoryHookTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/BundleFileWrapperFactoryHookTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/BundleFileWrapperFactoryHookTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2015, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/ClassLoaderHookTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/ClassLoaderHookTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/ClassLoaderHookTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/ClassLoaderHookTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/ContextFinderTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/ContextFinderTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/ContextFinderTests.java 1970-01-01 00:00:00.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/ContextFinderTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -0,0 +1,55 @@ +/******************************************************************************* + * Copyright (c) 2013, 2017 IBM Corporation and others. + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package org.eclipse.osgi.tests.hooks.framework; + +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; +import org.eclipse.osgi.tests.OSGiTestsActivator; +import org.osgi.framework.BundleContext; +import org.osgi.framework.Constants; +import org.osgi.framework.InvalidSyntaxException; +import org.osgi.framework.launch.Framework; + +public class ContextFinderTests extends AbstractFrameworkHookTests { + + private Map configuration; + private Framework framework; + + protected void setUp() throws Exception { + super.setUp(); + File file = OSGiTestsActivator.getContext().getDataFile(getName()); + configuration = new HashMap(); + configuration.put(Constants.FRAMEWORK_STORAGE, file.getAbsolutePath()); + framework = createFramework(configuration); + initAndStart(framework); + } + + protected void tearDown() throws Exception { + stopQuietly(framework); + super.tearDown(); + } + + public void testContextClassLoaderNullLocal() throws InvalidSyntaxException, IOException { + BundleContext bc = framework.getBundleContext(); + ClassLoader contextFinder = bc.getService(bc.getServiceReferences(ClassLoader.class, "(equinox.classloader.type=contextClassLoader)").iterator().next()); + Enumeration result = contextFinder.getResources("does/not/exist.txt"); + assertNotNull("Null result.", result); + assertFalse("Found unexpected result", result.hasMoreElements()); + } + +} diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/StorageHookTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/StorageHookTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/StorageHookTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/StorageHookTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/internal/plugins/InstallTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/internal/plugins/InstallTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/internal/plugins/InstallTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/internal/plugins/InstallTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2015 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/listeners/ExceptionHandlerTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/listeners/ExceptionHandlerTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/listeners/ExceptionHandlerTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/listeners/ExceptionHandlerTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2015 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/misc/MiscTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/misc/MiscTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/misc/MiscTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/misc/MiscTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/OSGiTest.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/OSGiTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/OSGiTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/OSGiTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/OSGiTestsActivator.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/OSGiTestsActivator.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/OSGiTestsActivator.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/OSGiTestsActivator.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/AllTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/AllTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/AllTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/AllTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/BasePerformanceTest.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/BasePerformanceTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/BasePerformanceTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/BasePerformanceTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/CaseMapPerformanceTest.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/CaseMapPerformanceTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/CaseMapPerformanceTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/CaseMapPerformanceTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2015 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/StatePerformanceTest.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/StatePerformanceTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/StatePerformanceTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/StatePerformanceTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2015 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/StateUsesPerformanceTest.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/StateUsesPerformanceTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/StateUsesPerformanceTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/StateUsesPerformanceTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/permissions/AdminPermissionTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/permissions/AdminPermissionTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/permissions/AdminPermissionTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/permissions/AdminPermissionTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/permissions/PackagePermissionTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/permissions/PackagePermissionTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/permissions/PackagePermissionTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/permissions/PackagePermissionTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/permissions/PermissionTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/permissions/PermissionTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/permissions/PermissionTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/permissions/PermissionTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/permissions/ServicePermissionTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/permissions/ServicePermissionTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/permissions/ServicePermissionTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/permissions/ServicePermissionTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestAttributes_001.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestAttributes_001.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestAttributes_001.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestAttributes_001.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestBSN_001.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestBSN_001.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestBSN_001.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestBSN_001.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_001.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_001.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_001.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_001.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_002.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_002.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_002.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_002.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_003.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_003.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_003.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_003.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_004.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_004.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_004.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_004.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_005.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_005.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_005.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_005.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_006.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_006.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_006.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_006.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_001.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_001.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_001.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_001.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_002.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_002.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_002.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_002.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_003.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_003.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_003.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_003.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_004.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_004.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_004.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_004.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_005.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_005.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_005.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_005.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_006.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_006.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_006.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_006.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGenerated_001.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGenerated_001.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGenerated_001.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGenerated_001.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_001.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_001.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_001.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_001.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_002.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_002.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_002.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_002.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_003.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_003.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_003.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_003.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_006.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_006.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_006.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_006.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_008.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_008.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_008.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_008.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestOptional_001.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestOptional_001.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestOptional_001.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestOptional_001.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestOptional_002.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestOptional_002.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestOptional_002.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestOptional_002.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestPropagation_001.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestPropagation_001.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestPropagation_001.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestPropagation_001.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestPropagation_003.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestPropagation_003.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestPropagation_003.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestPropagation_003.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_001.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_001.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_001.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_001.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_002.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_002.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_002.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_002.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_003.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_003.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_003.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_003.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_004.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_004.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_004.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_004.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_005.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_005.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_005.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_005.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_006.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_006.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_006.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_006.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_007.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_007.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_007.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_007.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_001.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_001.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_001.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_001.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_002.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_002.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_002.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_002.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_003.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_003.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_003.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_003.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/AbstractResourceTest.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/AbstractResourceTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/AbstractResourceTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/AbstractResourceTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/AllTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/AllTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/AllTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/AllTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/BasicTest.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/BasicTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/BasicTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/BasicTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2015 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/ResolverHookTests.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/ResolverHookTests.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/ResolverHookTests.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/ResolverHookTests.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2011, 2015 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/BaseSecurityTest.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/BaseSecurityTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/BaseSecurityTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/BaseSecurityTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/KeyStoreTrustEngineTest.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/KeyStoreTrustEngineTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/KeyStoreTrustEngineTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/KeyStoreTrustEngineTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/OSGiAPICertificateTest.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/OSGiAPICertificateTest.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/OSGiAPICertificateTest.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/OSGiAPICertificateTest.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/SecurityTestSuite.java 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/SecurityTestSuite.java --- 4.8-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/SecurityTestSuite.java 2018-05-28 15:15:31.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/SecurityTestSuite.java 2018-08-27 15:36:00.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public Licen