diff -pruN 4.8-1/bundles/org.eclipse.core.contenttype/about.html 4.9-1/bundles/org.eclipse.core.contenttype/about.html --- 4.8-1/bundles/org.eclipse.core.contenttype/about.html 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/about.html 2018-09-06 10:51:21.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.core.contenttype/build.properties 4.9-1/bundles/org.eclipse.core.contenttype/build.properties --- 4.8-1/bundles/org.eclipse.core.contenttype/build.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/build.properties 2018-09-06 10:51:21.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.core.contenttype/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.core.contenttype/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.core.contenttype/META-INF/MANIFEST.MF 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/META-INF/MANIFEST.MF 2018-09-06 10:51:21.000000000 +0000 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.core.contenttype; singleton:=true -Bundle-Version: 3.7.0.qualifier +Bundle-Version: 3.7.100.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.equinox.preferences;bundle-version="[3.2.0,4.0.0)", diff -pruN 4.8-1/bundles/org.eclipse.core.contenttype/plugin.properties 4.9-1/bundles/org.eclipse.core.contenttype/plugin.properties --- 4.8-1/bundles/org.eclipse.core.contenttype/plugin.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/plugin.properties 2018-09-06 10:51:21.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.core.contenttype/pom.xml 4.9-1/bundles/org.eclipse.core.contenttype/pom.xml --- 4.8-1/bundles/org.eclipse.core.contenttype/pom.xml 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/pom.xml 2018-09-06 10:51:21.000000000 +0000 @@ -14,11 +14,11 @@ eclipse.platform.runtime eclipse.platform.runtime - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.core org.eclipse.core.contenttype - 3.7.0-SNAPSHOT + 3.7.100-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.core.contenttype/schema/contentTypes.exsd 4.9-1/bundles/org.eclipse.core.contenttype/schema/contentTypes.exsd --- 4.8-1/bundles/org.eclipse.core.contenttype/schema/contentTypes.exsd 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/schema/contentTypes.exsd 2018-09-06 10:51:21.000000000 +0000 @@ -370,12 +370,15 @@ Also, the org.eclipse.core.contenttype p Copyright (c) 2004, 2008 IBM Corporation and others.<br> -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 <a -href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a> +href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-v20.html</a>/ + +SPDX-License-Identifier: EPL-2.0 diff -pruN 4.8-1/bundles/org.eclipse.core.contenttype/.settings/org.eclipse.jdt.ui.prefs 4.9-1/bundles/org.eclipse.core.contenttype/.settings/org.eclipse.jdt.ui.prefs --- 4.8-1/bundles/org.eclipse.core.contenttype/.settings/org.eclipse.jdt.ui.prefs 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/.settings/org.eclipse.jdt.ui.prefs 2018-09-06 10:51:21.000000000 +0000 @@ -65,7 +65,7 @@ org.eclipse.jdt.ui.ignorelowercasenames= org.eclipse.jdt.ui.importorder=; org.eclipse.jdt.ui.javadoc=false org.eclipse.jdt.ui.ondemandthreshold=3 -org.eclipse.jdt.ui.text.custom_code_templates= +org.eclipse.jdt.ui.text.custom_code_templates= sp_cleanup.add_default_serial_version_id=false sp_cleanup.add_generated_serial_version_id=false sp_cleanup.add_missing_annotations=false diff -pruN 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/Activator.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/Activator.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/Activator.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/Activator.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 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.core.contenttype/src/org/eclipse/core/internal/content/BasicDescription.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/BasicDescription.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/BasicDescription.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/BasicDescription.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/internal/content/ContentDescription.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentDescription.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentDescription.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentDescription.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/internal/content/ContentMessages.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentMessages.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentMessages.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentMessages.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,8 +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 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html + * Copyright (c) 2005 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeBuilder.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeBuilder.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeBuilder.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeBuilder.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeCatalog.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeCatalog.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeCatalog.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeCatalog.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeHandler.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeHandler.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeHandler.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeHandler.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/internal/content/ContentType.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentType.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentType.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentType.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeManager.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeManager.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeManager.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeManager.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeMatcher.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeMatcher.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeMatcher.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeMatcher.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeSettings.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeSettings.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeSettings.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeSettings.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeVisitor.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeVisitor.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeVisitor.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeVisitor.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/internal/content/DefaultDescription.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/DefaultDescription.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/DefaultDescription.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/DefaultDescription.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/internal/content/FileSpec.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/FileSpec.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/FileSpec.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/FileSpec.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/internal/content/IContentConstants.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/IContentConstants.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/IContentConstants.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/IContentConstants.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/internal/content/IContentTypeInfo.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/IContentTypeInfo.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/IContentTypeInfo.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/IContentTypeInfo.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/internal/content/ILazySource.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ILazySource.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ILazySource.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ILazySource.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/internal/content/LazyInputStream.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/LazyInputStream.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/LazyInputStream.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/LazyInputStream.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 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.core.contenttype/src/org/eclipse/core/internal/content/LazyReader.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/LazyReader.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/LazyReader.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/LazyReader.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/internal/content/LowLevelIOException.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/LowLevelIOException.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/LowLevelIOException.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/LowLevelIOException.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/internal/content/messages.properties 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/messages.properties --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/messages.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/messages.properties 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2000, 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.core.contenttype/src/org/eclipse/core/internal/content/PreferenceModifyListener.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/PreferenceModifyListener.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/PreferenceModifyListener.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/PreferenceModifyListener.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/internal/content/TextContentDescriber.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/TextContentDescriber.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/TextContentDescriber.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/TextContentDescriber.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 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.core.contenttype/src/org/eclipse/core/internal/content/Util.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/Util.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/Util.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/Util.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/internal/content/XMLContentDescriber.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/XMLContentDescriber.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/XMLContentDescriber.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/XMLContentDescriber.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/internal/content/XMLRootHandler.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/XMLRootHandler.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/XMLRootHandler.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/XMLRootHandler.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 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.core.contenttype/src/org/eclipse/core/runtime/content/BinarySignatureDescriber.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/BinarySignatureDescriber.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/BinarySignatureDescriber.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/BinarySignatureDescriber.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 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.core.contenttype/src/org/eclipse/core/runtime/content/IContentDescriber.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentDescriber.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentDescriber.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentDescriber.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/runtime/content/IContentDescription.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentDescription.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentDescription.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentDescription.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/runtime/content/IContentType.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentType.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentType.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentType.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/runtime/content/IContentTypeManager.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentTypeManager.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentTypeManager.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentTypeManager.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/runtime/content/IContentTypeMatcher.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentTypeMatcher.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentTypeMatcher.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentTypeMatcher.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 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.core.contenttype/src/org/eclipse/core/runtime/content/IContentTypeSettings.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentTypeSettings.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentTypeSettings.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentTypeSettings.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/runtime/content/ITextContentDescriber.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/ITextContentDescriber.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/ITextContentDescriber.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/ITextContentDescriber.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/runtime/content/XMLContentDescriber.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/XMLContentDescriber.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/XMLContentDescriber.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/XMLContentDescriber.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/runtime/content/XMLRootElementContentDescriber2.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/XMLRootElementContentDescriber2.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/XMLRootElementContentDescriber2.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/XMLRootElementContentDescriber2.java 2018-09-06 10:51:21.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.core.contenttype/src/org/eclipse/core/runtime/content/XMLRootElementContentDescriber.java 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/XMLRootElementContentDescriber.java --- 4.8-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/XMLRootElementContentDescriber.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/XMLRootElementContentDescriber.java 2018-09-06 10:51:21.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.core.expressions/about.html 4.9-1/bundles/org.eclipse.core.expressions/about.html --- 4.8-1/bundles/org.eclipse.core.expressions/about.html 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/about.html 2018-09-06 10:51:21.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.core.expressions/build.properties 4.9-1/bundles/org.eclipse.core.expressions/build.properties --- 4.8-1/bundles/org.eclipse.core.expressions/build.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/build.properties 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2000, 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.core.expressions/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.core.expressions/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.core.expressions/META-INF/MANIFEST.MF 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/META-INF/MANIFEST.MF 2018-09-06 10:51:21.000000000 +0000 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.core.expressions; singleton:=true -Bundle-Version: 3.6.100.qualifier +Bundle-Version: 3.6.200.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.core.internal.expressions.ExpressionPlugin Bundle-Vendor: %providerName diff -pruN 4.8-1/bundles/org.eclipse.core.expressions/plugin.properties 4.9-1/bundles/org.eclipse.core.expressions/plugin.properties --- 4.8-1/bundles/org.eclipse.core.expressions/plugin.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/plugin.properties 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2000, 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.core.expressions/pom.xml 4.9-1/bundles/org.eclipse.core.expressions/pom.xml --- 4.8-1/bundles/org.eclipse.core.expressions/pom.xml 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/pom.xml 2018-09-06 10:51:21.000000000 +0000 @@ -14,11 +14,11 @@ eclipse.platform.runtime eclipse.platform.runtime - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.core org.eclipse.core.expressions - 3.6.100-SNAPSHOT + 3.6.200-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.core.expressions/schema/definitions.exsd 4.9-1/bundles/org.eclipse.core.expressions/schema/definitions.exsd --- 4.8-1/bundles/org.eclipse.core.expressions/schema/definitions.exsd 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/schema/definitions.exsd 2018-09-06 10:51:21.000000000 +0000 @@ -146,7 +146,10 @@ Then this expression definition can be u Copyright (c) 2007, 2008 IBM Corporation and others.<br> -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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a> + +This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-v20.html</a>/ + +SPDX-License-Identifier: EPL-2.0 diff -pruN 4.8-1/bundles/org.eclipse.core.expressions/schema/expressionLanguage.exsd 4.9-1/bundles/org.eclipse.core.expressions/schema/expressionLanguage.exsd --- 4.8-1/bundles/org.eclipse.core.expressions/schema/expressionLanguage.exsd 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/schema/expressionLanguage.exsd 2018-09-06 10:51:21.000000000 +0000 @@ -507,7 +507,10 @@ rules: Copyright (c) 2001, 2013 IBM Corporation and others.<br> -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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a> + +This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-v20.html</a>/ + +SPDX-License-Identifier: EPL-2.0 diff -pruN 4.8-1/bundles/org.eclipse.core.expressions/schema/propertyTesters.exsd 4.9-1/bundles/org.eclipse.core.expressions/schema/propertyTesters.exsd --- 4.8-1/bundles/org.eclipse.core.expressions/schema/propertyTesters.exsd 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/schema/propertyTesters.exsd 2018-09-06 10:51:21.000000000 +0000 @@ -139,7 +139,10 @@ Copyright (c) 2001, 2004 IBM Corporation and others.<br> -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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a> + +This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-v20.html</a>/ + +SPDX-License-Identifier: EPL-2.0 diff -pruN 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/ElementHandler.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/ElementHandler.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/ElementHandler.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/ElementHandler.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/expressions/EvaluationContext.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/EvaluationContext.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/EvaluationContext.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/EvaluationContext.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/expressions/EvaluationResult.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/EvaluationResult.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/EvaluationResult.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/EvaluationResult.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/expressions/ExpressionConverter.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/ExpressionConverter.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/ExpressionConverter.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/ExpressionConverter.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/expressions/ExpressionInfo.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/ExpressionInfo.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/ExpressionInfo.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/ExpressionInfo.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/expressions/Expression.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/Expression.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/Expression.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/Expression.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/expressions/ExpressionTagNames.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/ExpressionTagNames.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/ExpressionTagNames.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/ExpressionTagNames.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/expressions/ICountable.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/ICountable.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/ICountable.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/ICountable.java 2018-09-06 10:51:21.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.core.expressions/src/org/eclipse/core/expressions/IEvaluationContext.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IEvaluationContext.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IEvaluationContext.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IEvaluationContext.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/expressions/IIterable.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IIterable.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IIterable.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IIterable.java 2018-09-06 10:51:21.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.core.expressions/src/org/eclipse/core/expressions/IPropertyTester.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IPropertyTester.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IPropertyTester.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IPropertyTester.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/expressions/IVariableResolver.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IVariableResolver.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IVariableResolver.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IVariableResolver.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/expressions/PropertyTester.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/PropertyTester.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/PropertyTester.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/PropertyTester.java 2018-09-06 10:51:21.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.core.expressions/src/org/eclipse/core/internal/expressions/AdaptExpression.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/AdaptExpression.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/AdaptExpression.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/AdaptExpression.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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 @@ -11,9 +14,12 @@ *******************************************************************************/ package org.eclipse.core.internal.expressions; +import java.util.Arrays; + import org.w3c.dom.Element; import org.eclipse.core.expressions.EvaluationResult; +import org.eclipse.core.expressions.Expression; import org.eclipse.core.expressions.ExpressionInfo; import org.eclipse.core.expressions.IEvaluationContext; @@ -125,4 +131,18 @@ public class AdaptExpression extends Com info.markDefaultVariableAccessed(); super.collectExpressionInfo(info); } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(getClass().getSimpleName()); + builder.append(" [type=").append(fTypeName); //$NON-NLS-1$ + Expression[] children = getChildren(); + if (children.length > 0) { + builder.append(", children="); //$NON-NLS-1$ + builder.append(Arrays.toString(children)); + } + builder.append("]"); //$NON-NLS-1$ + return builder.toString(); + } + } diff -pruN 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/AndExpression.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/AndExpression.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/AndExpression.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/AndExpression.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/internal/expressions/CompositeExpression.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/CompositeExpression.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/CompositeExpression.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/CompositeExpression.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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 @@ -11,6 +14,7 @@ package org.eclipse.core.internal.expressions; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.eclipse.core.expressions.EvaluationResult; @@ -82,4 +86,17 @@ public abstract class CompositeExpressio protected int computeHashCode() { return HASH_INITIAL * HASH_FACTOR + hashCode(fExpressions); } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(getClass().getSimpleName()); + Expression[] children = getChildren(); + if (children.length > 0) { + builder.append(" [children="); //$NON-NLS-1$ + builder.append(Arrays.toString(children)); + builder.append("]"); //$NON-NLS-1$ + } + return builder.toString(); + } + } diff -pruN 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/CountExpression.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/CountExpression.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/CountExpression.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/CountExpression.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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. @@ -145,4 +148,44 @@ public class CountExpression extends Exp return HASH_INITIAL * HASH_FACTOR + fMode * HASH_FACTOR + fSize; } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(getClass().getSimpleName()); + builder.append(" [ size="); //$NON-NLS-1$ + builder.append(fSize); + builder.append(", mode: "); //$NON-NLS-1$ + builder.append(fMode); + switch (fMode) { + case GREATER_THAN: + builder.append(" GREATER_THAN"); //$NON-NLS-1$ + break; + case LESS_THAN: + builder.append(" LESS_THAN"); //$NON-NLS-1$ // -N) + break; + case ANY_NUMBER: + builder.append(" ANY_NUMBER"); //$NON-NLS-1$ // * + break; + case EXACT: + builder.append(" EXACT"); //$NON-NLS-1$ // N + break; + case ONE_OR_MORE: + builder.append(" ONE_OR_MORE"); //$NON-NLS-1$ // + + break; + case NONE_OR_ONE: + builder.append(" NONE_OR_ONE"); //$NON-NLS-1$ // ? + break; + case NONE: + builder.append(" NONE"); //$NON-NLS-1$ // ! + break; + case UNKNOWN: + builder.append(" UNKNOWN"); //$NON-NLS-1$ ; + break; + default: + break; + } + builder.append("]"); //$NON-NLS-1$ + return builder.toString(); + } + } diff -pruN 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/DefaultVariable.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/DefaultVariable.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/DefaultVariable.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/DefaultVariable.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/internal/expressions/DefinitionRegistry.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/DefinitionRegistry.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/DefinitionRegistry.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/DefinitionRegistry.java 2018-09-06 10:51:21.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.core.expressions/src/org/eclipse/core/internal/expressions/EnablementExpression.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/EnablementExpression.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/EnablementExpression.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/EnablementExpression.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/internal/expressions/EqualsExpression.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/EqualsExpression.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/EqualsExpression.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/EqualsExpression.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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 @@ -70,4 +73,13 @@ public class EqualsExpression extends Ex protected int computeHashCode() { return HASH_INITIAL * HASH_FACTOR + fExpectedValue.hashCode(); } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(getClass().getSimpleName()); + builder.append(" [expected="); //$NON-NLS-1$ + builder.append(fExpectedValue); + builder.append("]"); //$NON-NLS-1$ + return builder.toString(); + } } diff -pruN 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/ExpressionMessages.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/ExpressionMessages.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/ExpressionMessages.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/ExpressionMessages.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/internal/expressions/ExpressionMessages.properties 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/ExpressionMessages.properties --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/ExpressionMessages.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/ExpressionMessages.properties 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/internal/expressions/ExpressionPlugin.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/ExpressionPlugin.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/ExpressionPlugin.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/ExpressionPlugin.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/internal/expressions/Expressions.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/Expressions.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/Expressions.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/Expressions.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/internal/expressions/ExpressionStatus.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/ExpressionStatus.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/ExpressionStatus.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/ExpressionStatus.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/internal/expressions/InstanceofExpression.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/InstanceofExpression.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/InstanceofExpression.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/InstanceofExpression.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/internal/expressions/IterateExpression.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/IterateExpression.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/IterateExpression.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/IterateExpression.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,15 +1,19 @@ /******************************************************************************* * Copyright (c) 2000, 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 *******************************************************************************/ package org.eclipse.core.internal.expressions; +import java.util.Arrays; import java.util.Collection; import java.util.Iterator; import java.util.List; @@ -17,6 +21,7 @@ import java.util.List; import org.w3c.dom.Element; import org.eclipse.core.expressions.EvaluationResult; +import org.eclipse.core.expressions.Expression; import org.eclipse.core.expressions.ExpressionInfo; import org.eclipse.core.expressions.IEvaluationContext; import org.eclipse.core.expressions.IIterable; @@ -237,4 +242,17 @@ public class IterateExpression extends C return HASH_INITIAL * HASH_FACTOR + hashCode(fExpressions) * HASH_FACTOR + fOperator; } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(getClass().getSimpleName()); + builder.append(" [type=").append(fOperator == AND ? "AND" : "OR"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + Expression[] children = getChildren(); + if (children.length > 0) { + builder.append(", children="); //$NON-NLS-1$ + builder.append(Arrays.toString(children)); + } + builder.append("]"); //$NON-NLS-1$ + return builder.toString(); + } } diff -pruN 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/Messages.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/Messages.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/Messages.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/Messages.java 2018-09-06 10:51:21.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.core.expressions/src/org/eclipse/core/internal/expressions/NotExpression.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/NotExpression.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/NotExpression.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/NotExpression.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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 @@ -54,4 +57,9 @@ public class NotExpression extends Expre protected int computeHashCode() { return HASH_INITIAL * HASH_FACTOR + fExpression.hashCode(); } + + @Override + public String toString() { + return getClass().getSimpleName(); + } } diff -pruN 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/OrExpression.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/OrExpression.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/OrExpression.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/OrExpression.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/internal/expressions/PropertyCache.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/PropertyCache.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/PropertyCache.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/PropertyCache.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/internal/expressions/Property.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/Property.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/Property.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/Property.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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 @@ -16,9 +19,9 @@ import org.eclipse.core.runtime.Assert; public class Property { - private Class fType; - private String fNamespace; - private String fName; + private final Class fType; + private final String fNamespace; + private final String fName; private IPropertyTester fTester; @@ -70,4 +73,21 @@ public class Property { public int hashCode() { return (fType.hashCode() << 16) | fNamespace.hashCode() << 8 | fName.hashCode(); } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("Property ["); //$NON-NLS-1$ + builder.append(fNamespace); + builder.append("."); //$NON-NLS-1$ + builder.append(fName); + builder.append(", type="); //$NON-NLS-1$ + builder.append(fType); + if (fTester != null) { + builder.append(", tester="); //$NON-NLS-1$ + builder.append(fTester); + } + builder.append("]"); //$NON-NLS-1$ + return builder.toString(); + } } diff -pruN 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/propertytester/PlatformPropertyTester.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/propertytester/PlatformPropertyTester.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/propertytester/PlatformPropertyTester.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/propertytester/PlatformPropertyTester.java 2018-09-06 10:51:21.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: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/PropertyTesterDescriptor.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/PropertyTesterDescriptor.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/PropertyTesterDescriptor.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/PropertyTesterDescriptor.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/internal/expressions/ReferenceExpression.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/ReferenceExpression.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/ReferenceExpression.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/ReferenceExpression.java 2018-09-06 10:51:21.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 @@ -97,4 +100,13 @@ public class ReferenceExpression extends protected int computeHashCode() { return HASH_INITIAL * HASH_FACTOR + fDefinitionId.hashCode(); } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(getClass().getSimpleName()); + builder.append(" [definitionId="); //$NON-NLS-1$ + builder.append(fDefinitionId); + builder.append("]"); //$NON-NLS-1$ + return builder.toString(); + } } \ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/ResolveExpression.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/ResolveExpression.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/ResolveExpression.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/ResolveExpression.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,19 +1,25 @@ /******************************************************************************* * Copyright (c) 2000, 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 *******************************************************************************/ package org.eclipse.core.internal.expressions; +import java.util.Arrays; + import org.w3c.dom.Element; import org.eclipse.core.expressions.EvaluationContext; import org.eclipse.core.expressions.EvaluationResult; +import org.eclipse.core.expressions.Expression; import org.eclipse.core.expressions.ExpressionInfo; import org.eclipse.core.expressions.IEvaluationContext; @@ -90,4 +96,20 @@ public class ResolveExpression extends C * HASH_FACTOR + hashCode(fArgs) * HASH_FACTOR + fVariable.hashCode(); } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(getClass().getSimpleName()); + builder.append(" [variable=").append(fVariable); //$NON-NLS-1$ + if (fArgs != null) { + builder.append(", args=").append(Arrays.toString(fArgs)); //$NON-NLS-1$ + } + Expression[] children = getChildren(); + if (children.length > 0) { + builder.append(", children="); //$NON-NLS-1$ + builder.append(Arrays.toString(children)); + } + builder.append("]"); //$NON-NLS-1$ + return builder.toString(); + } } diff -pruN 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/StandardElementHandler.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/StandardElementHandler.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/StandardElementHandler.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/StandardElementHandler.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/internal/expressions/SystemTestExpression.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/SystemTestExpression.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/SystemTestExpression.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/SystemTestExpression.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/internal/expressions/TestExpression.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/TestExpression.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/TestExpression.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/TestExpression.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/internal/expressions/TypeExtension.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/TypeExtension.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/TypeExtension.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/TypeExtension.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/internal/expressions/TypeExtensionManager.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/TypeExtensionManager.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/TypeExtensionManager.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/TypeExtensionManager.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/internal/expressions/util/LRUCache.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/util/LRUCache.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/util/LRUCache.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/util/LRUCache.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/internal/expressions/util/ToStringSorter.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/util/ToStringSorter.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/util/ToStringSorter.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/util/ToStringSorter.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.expressions/src/org/eclipse/core/internal/expressions/WithExpression.java 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/WithExpression.java --- 4.8-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/WithExpression.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/WithExpression.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,19 +1,25 @@ /******************************************************************************* * Copyright (c) 2000, 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 *******************************************************************************/ package org.eclipse.core.internal.expressions; +import java.util.Arrays; + import org.w3c.dom.Element; import org.eclipse.core.expressions.EvaluationContext; import org.eclipse.core.expressions.EvaluationResult; +import org.eclipse.core.expressions.Expression; import org.eclipse.core.expressions.ExpressionInfo; import org.eclipse.core.expressions.IEvaluationContext; @@ -84,4 +90,17 @@ public class WithExpression extends Comp } info.mergeExceptDefaultVariable(other); } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(getClass().getSimpleName()); + builder.append(" [variable=").append(fVariable); //$NON-NLS-1$ + Expression[] children = getChildren(); + if (children.length > 0) { + builder.append(", children="); //$NON-NLS-1$ + builder.append(Arrays.toString(children)); + } + builder.append("]"); //$NON-NLS-1$ + return builder.toString(); + } } \ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.core.jobs/about.html 4.9-1/bundles/org.eclipse.core.jobs/about.html --- 4.8-1/bundles/org.eclipse.core.jobs/about.html 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/about.html 2018-09-06 10:51:21.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.core.jobs/build.properties 4.9-1/bundles/org.eclipse.core.jobs/build.properties --- 4.8-1/bundles/org.eclipse.core.jobs/build.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/build.properties 2018-09-06 10:51:21.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.core.jobs/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.core.jobs/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.core.jobs/META-INF/MANIFEST.MF 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/META-INF/MANIFEST.MF 2018-09-06 10:51:21.000000000 +0000 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.core.jobs; singleton:=true -Bundle-Version: 3.10.0.qualifier +Bundle-Version: 3.10.100.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.core.internal.jobs;x-internal:=true, diff -pruN 4.8-1/bundles/org.eclipse.core.jobs/plugin.properties 4.9-1/bundles/org.eclipse.core.jobs/plugin.properties --- 4.8-1/bundles/org.eclipse.core.jobs/plugin.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/plugin.properties 2018-09-06 10:51:21.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.core.jobs/pom.xml 4.9-1/bundles/org.eclipse.core.jobs/pom.xml --- 4.8-1/bundles/org.eclipse.core.jobs/pom.xml 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/pom.xml 2018-09-06 10:51:21.000000000 +0000 @@ -15,12 +15,12 @@ eclipse.platform.runtime eclipse.platform.runtime - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.core org.eclipse.core.jobs - 3.10.0-SNAPSHOT + 3.10.100-SNAPSHOT eclipse-plugin -warn:-deprecation,raw,unchecked diff -pruN 4.8-1/bundles/org.eclipse.core.jobs/.settings/org.eclipse.jdt.ui.prefs 4.9-1/bundles/org.eclipse.core.jobs/.settings/org.eclipse.jdt.ui.prefs --- 4.8-1/bundles/org.eclipse.core.jobs/.settings/org.eclipse.jdt.ui.prefs 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/.settings/org.eclipse.jdt.ui.prefs 2018-09-06 10:51:21.000000000 +0000 @@ -67,7 +67,7 @@ org.eclipse.jdt.ui.importorder=; org.eclipse.jdt.ui.javadoc=false org.eclipse.jdt.ui.ondemandthreshold=3 org.eclipse.jdt.ui.staticondemandthreshold=99 -org.eclipse.jdt.ui.text.custom_code_templates= +org.eclipse.jdt.ui.text.custom_code_templates= sp_cleanup.add_default_serial_version_id=true sp_cleanup.add_generated_serial_version_id=false sp_cleanup.add_missing_annotations=false diff -pruN 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/Counter.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/Counter.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/Counter.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/Counter.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 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.core.jobs/src/org/eclipse/core/internal/jobs/DeadlockDetector.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/DeadlockDetector.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/DeadlockDetector.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/DeadlockDetector.java 2018-09-06 10:51:21.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.core.jobs/src/org/eclipse/core/internal/jobs/Deadlock.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/Deadlock.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/Deadlock.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/Deadlock.java 2018-09-06 10:51:21.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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/ImplicitJobs.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/ImplicitJobs.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/ImplicitJobs.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/ImplicitJobs.java 2018-09-06 10:51:21.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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/InternalJobGroup.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/InternalJobGroup.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/InternalJobGroup.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/InternalJobGroup.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2014 Google 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: * Thirumala Reddy Mutchukota - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/InternalJob.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/InternalJob.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/InternalJob.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/InternalJob.java 2018-09-06 10:51:21.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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/InternalWorker.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/InternalWorker.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/InternalWorker.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/InternalWorker.java 2018-09-06 10:51:21.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.core.jobs/src/org/eclipse/core/internal/jobs/JobActivator.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobActivator.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobActivator.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobActivator.java 2018-09-06 10:51:21.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.core.jobs/src/org/eclipse/core/internal/jobs/JobChangeEvent.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobChangeEvent.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobChangeEvent.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobChangeEvent.java 2018-09-06 10:51:21.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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobListeners.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobListeners.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobListeners.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobListeners.java 2018-09-06 10:51:21.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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobManager.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobManager.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobManager.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobManager.java 2018-09-06 10:51:21.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.core.jobs/src/org/eclipse/core/internal/jobs/JobMessages.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobMessages.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobMessages.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobMessages.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,8 +1,11 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation and others. All rights reserved. This +. +. 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 +t https://www.eclipse.org/legal/epl-2.0/ +t +t SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobOSGiUtils.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobOSGiUtils.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobOSGiUtils.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobOSGiUtils.java 2018-09-06 10:51:21.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.core.jobs/src/org/eclipse/core/internal/jobs/JobQueue.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobQueue.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobQueue.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobQueue.java 2018-09-06 10:51:21.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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobStatus.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobStatus.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobStatus.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobStatus.java 2018-09-06 10:51:21.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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/LockManager.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/LockManager.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/LockManager.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/LockManager.java 2018-09-06 10:51:21.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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/messages.properties 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/messages.properties --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/messages.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/messages.properties 2018-09-06 10:51:21.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.core.jobs/src/org/eclipse/core/internal/jobs/ObjectMap.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/ObjectMap.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/ObjectMap.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/ObjectMap.java 2018-09-06 10:51:21.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.core.jobs/src/org/eclipse/core/internal/jobs/OrderedLock.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/OrderedLock.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/OrderedLock.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/OrderedLock.java 2018-09-06 10:51:21.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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/Queue.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/Queue.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/Queue.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/Queue.java 2018-09-06 10:51:21.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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/Semaphore.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/Semaphore.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/Semaphore.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/Semaphore.java 2018-09-06 10:51:21.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.core.jobs/src/org/eclipse/core/internal/jobs/ThreadJob.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/ThreadJob.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/ThreadJob.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/ThreadJob.java 2018-09-06 10:51:21.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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/Worker.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/Worker.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/Worker.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/Worker.java 2018-09-06 10:51:21.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.core.jobs/src/org/eclipse/core/internal/jobs/WorkerPool.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/WorkerPool.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/WorkerPool.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/WorkerPool.java 2018-09-06 10:51:21.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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/IJobChangeEvent.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/IJobChangeEvent.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/IJobChangeEvent.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/IJobChangeEvent.java 2018-09-06 10:51:21.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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/IJobChangeListener.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/IJobChangeListener.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/IJobChangeListener.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/IJobChangeListener.java 2018-09-06 10:51:21.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.core.jobs/src/org/eclipse/core/runtime/jobs/IJobFunction.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/IJobFunction.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/IJobFunction.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/IJobFunction.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2014, 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.core.jobs/src/org/eclipse/core/runtime/jobs/IJobManager.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/IJobManager.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/IJobManager.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/IJobManager.java 2018-09-06 10:51:21.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.core.jobs/src/org/eclipse/core/runtime/jobs/IJobStatus.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/IJobStatus.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/IJobStatus.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/IJobStatus.java 2018-09-06 10:51:21.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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/ILock.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/ILock.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/ILock.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/ILock.java 2018-09-06 10:51:21.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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/ISchedulingRule.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/ISchedulingRule.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/ISchedulingRule.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/ISchedulingRule.java 2018-09-06 10:51:21.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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/JobChangeAdapter.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/JobChangeAdapter.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/JobChangeAdapter.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/JobChangeAdapter.java 2018-09-06 10:51:21.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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/JobGroup.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/JobGroup.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/JobGroup.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/JobGroup.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2014 Google 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: * Thirumala Reddy Mutchukota - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/Job.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/Job.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/Job.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/Job.java 2018-09-06 10:51:21.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.core.jobs/src/org/eclipse/core/runtime/jobs/LockListener.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/LockListener.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/LockListener.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/LockListener.java 2018-09-06 10:51:21.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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/MultiRule.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/MultiRule.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/MultiRule.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/MultiRule.java 2018-09-06 10:51:21.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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/ProgressProvider.java 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/ProgressProvider.java --- 4.8-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/ProgressProvider.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/ProgressProvider.java 2018-09-06 10:51:21.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.core.runtime/about.html 4.9-1/bundles/org.eclipse.core.runtime/about.html --- 4.8-1/bundles/org.eclipse.core.runtime/about.html 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/about.html 2018-09-06 10:51:21.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.core.runtime/build.properties 4.9-1/bundles/org.eclipse.core.runtime/build.properties --- 4.8-1/bundles/org.eclipse.core.runtime/build.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/build.properties 2018-09-06 10:51:21.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.core.runtime/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF 2018-09-06 10:51:21.000000000 +0000 @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-Version: 3.14.0.qualifier +Bundle-Version: 3.15.0.qualifier Bundle-SymbolicName: org.eclipse.core.runtime; singleton:=true Bundle-Vendor: %providerName Bundle-Activator: org.eclipse.core.internal.runtime.PlatformActivator @@ -10,13 +10,13 @@ Export-Package: org.eclipse.core.interna org.eclipse.core.internal.runtime;x-internal:=true, org.eclipse.core.runtime;version="3.5.0" Require-Bundle: javax.inject;bundle-version="1.0.0";resolution:=optional;visibility:=reexport, - org.eclipse.osgi;bundle-version="[3.7.0,4.0.0)";visibility:=reexport, - org.eclipse.equinox.common;bundle-version="[3.8.0,4.0.0)";visibility:=reexport, - org.eclipse.core.jobs;bundle-version="[3.2.0,4.0.0)";visibility:=reexport, + org.eclipse.osgi;bundle-version="[3.13.0,4.0.0)";visibility:=reexport, + org.eclipse.equinox.common;bundle-version="[3.10.0,4.0.0)";visibility:=reexport, + org.eclipse.core.jobs;bundle-version="[3.10.0,4.0.0)";visibility:=reexport, org.eclipse.equinox.registry;bundle-version="[3.8.0,4.0.0)";visibility:=reexport, - org.eclipse.equinox.preferences;bundle-version="[3.4.0,4.0.0)";visibility:=reexport, - org.eclipse.core.contenttype;bundle-version="[3.3.0,4.0.0)";visibility:=reexport, - org.eclipse.equinox.app;bundle-version="1.0.0";visibility:=reexport + org.eclipse.equinox.preferences;bundle-version="[3.7.0,4.0.0)";visibility:=reexport, + org.eclipse.core.contenttype;bundle-version="[3.7.0,4.0.0)";visibility:=reexport, + org.eclipse.equinox.app;bundle-version="1.3.0";visibility:=reexport Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 DynamicImport-Package: org.eclipse.core.internal.runtime.auth diff -pruN 4.8-1/bundles/org.eclipse.core.runtime/plugin.properties 4.9-1/bundles/org.eclipse.core.runtime/plugin.properties --- 4.8-1/bundles/org.eclipse.core.runtime/plugin.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/plugin.properties 2018-09-06 10:51:21.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.core.runtime/pom.xml 4.9-1/bundles/org.eclipse.core.runtime/pom.xml --- 4.8-1/bundles/org.eclipse.core.runtime/pom.xml 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/pom.xml 2018-09-06 10:51:21.000000000 +0000 @@ -14,12 +14,12 @@ eclipse.platform.runtime eclipse.platform.runtime - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.core org.eclipse.core.runtime - 3.14.0-SNAPSHOT + 3.15.0-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.core.runtime/schema/contentTypes.exsd 4.9-1/bundles/org.eclipse.core.runtime/schema/contentTypes.exsd --- 4.8-1/bundles/org.eclipse.core.runtime/schema/contentTypes.exsd 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/schema/contentTypes.exsd 2018-09-06 10:51:21.000000000 +0000 @@ -353,12 +353,15 @@ Also, the org.eclipse.core.runtime plug- Copyright (c) 2004, 2008 IBM Corporation and others.<br> -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 <a -href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a> +href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-v20.html</a>/ + +SPDX-License-Identifier: EPL-2.0 diff -pruN 4.8-1/bundles/org.eclipse.core.runtime/schema/preferences.exsd 4.9-1/bundles/org.eclipse.core.runtime/schema/preferences.exsd --- 4.8-1/bundles/org.eclipse.core.runtime/schema/preferences.exsd 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/schema/preferences.exsd 2018-09-06 10:51:21.000000000 +0000 @@ -188,12 +188,15 @@ If the client chooses to let the Eclipse Copyright (c) 2004, 2014 IBM Corporation and others.<br> -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 <a -href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a> +href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-v20.html</a>/ + +SPDX-License-Identifier: EPL-2.0 diff -pruN 4.8-1/bundles/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs 4.9-1/bundles/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs --- 4.8-1/bundles/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs 2018-09-06 10:51:21.000000000 +0000 @@ -27,6 +27,7 @@ org.eclipse.jdt.core.compiler.debug.loca org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.maxProblemPerUnit=1000 +org.eclipse.jdt.core.compiler.problem.APILeak=warning org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore @@ -58,7 +59,7 @@ org.eclipse.jdt.core.compiler.problem.in org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore @@ -101,12 +102,16 @@ org.eclipse.jdt.core.compiler.problem.su org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning +org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled +org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore @@ -127,6 +132,7 @@ org.eclipse.jdt.core.compiler.problem.un org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false diff -pruN 4.8-1/bundles/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs 4.9-1/bundles/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs --- 4.8-1/bundles/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs 2018-09-06 10:51:21.000000000 +0000 @@ -65,7 +65,7 @@ org.eclipse.jdt.ui.ignorelowercasenames= org.eclipse.jdt.ui.importorder=; org.eclipse.jdt.ui.ondemandthreshold=3 org.eclipse.jdt.ui.staticondemandthreshold=99 -org.eclipse.jdt.ui.text.custom_code_templates= +org.eclipse.jdt.ui.text.custom_code_templates= sp_cleanup.add_default_serial_version_id=false sp_cleanup.add_generated_serial_version_id=false sp_cleanup.add_missing_annotations=false diff -pruN 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/legacy/InitLegacyPreferences.java 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/legacy/InitLegacyPreferences.java --- 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/legacy/InitLegacyPreferences.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/legacy/InitLegacyPreferences.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 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.core.runtime/src/org/eclipse/core/internal/preferences/legacy/PreferenceForwarder.java 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/legacy/PreferenceForwarder.java --- 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/legacy/PreferenceForwarder.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/legacy/PreferenceForwarder.java 2018-09-06 10:51:21.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.core.runtime/src/org/eclipse/core/internal/preferences/legacy/ProductPreferencesService.java 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/legacy/ProductPreferencesService.java --- 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/legacy/ProductPreferencesService.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/legacy/ProductPreferencesService.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 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.core.runtime/src/org/eclipse/core/internal/runtime/AuthorizationHandler.java 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/AuthorizationHandler.java --- 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/AuthorizationHandler.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/AuthorizationHandler.java 2018-09-06 10:51:21.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.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java --- 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* - * Copyright (c) 2000, 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 + * Copyright (c) 2000, 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 @@ -12,62 +15,27 @@ *******************************************************************************/ package org.eclipse.core.internal.runtime; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; +import java.io.*; import java.net.MalformedURLException; import java.net.URL; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Hashtable; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.ResourceBundle; -import java.util.StringTokenizer; - +import java.util.*; import org.eclipse.core.internal.preferences.exchange.ILegacyPreferences; import org.eclipse.core.internal.preferences.exchange.IProductPreferencesService; import org.eclipse.core.internal.preferences.legacy.InitLegacyPreferences; import org.eclipse.core.internal.preferences.legacy.ProductPreferencesService; -import org.eclipse.core.runtime.Assert; -import org.eclipse.core.runtime.IAdapterManager; -import org.eclipse.core.runtime.IBundleGroupProvider; -import org.eclipse.core.runtime.IExtensionRegistry; -import org.eclipse.core.runtime.ILog; -import org.eclipse.core.runtime.ILogListener; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProduct; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Plugin; -import org.eclipse.core.runtime.RegistryFactory; +import org.eclipse.core.runtime.*; import org.eclipse.core.runtime.content.IContentTypeManager; import org.eclipse.core.runtime.preferences.IPreferencesService; import org.eclipse.equinox.app.IApplicationContext; +import org.eclipse.equinox.internal.app.*; import org.eclipse.equinox.internal.app.Activator; -import org.eclipse.equinox.internal.app.CommandLineArgs; -import org.eclipse.equinox.internal.app.EclipseAppContainer; -import org.eclipse.equinox.internal.app.IBranding; -import org.eclipse.equinox.log.ExtendedLogReaderService; -import org.eclipse.equinox.log.ExtendedLogService; -import org.eclipse.equinox.log.Logger; +import org.eclipse.equinox.log.*; import org.eclipse.osgi.framework.log.FrameworkLog; import org.eclipse.osgi.service.datalocation.Location; import org.eclipse.osgi.service.debug.DebugOptions; import org.eclipse.osgi.service.environment.EnvironmentInfo; import org.eclipse.osgi.service.resolver.PlatformAdmin; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleException; -import org.osgi.framework.Filter; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.framework.ServiceReference; -import org.osgi.framework.ServiceRegistration; +import org.osgi.framework.*; import org.osgi.service.packageadmin.PackageAdmin; import org.osgi.util.tracker.ServiceTracker; @@ -237,12 +205,10 @@ public final class InternalPlatform { public String getBundleId(Object object) { if (object == null) return null; - PackageAdmin packageAdmin = getBundleAdmin(); - if (packageAdmin == null) - return null; - Bundle source = packageAdmin.getBundle(object.getClass()); + Bundle source = FrameworkUtil.getBundle(object.getClass()); if (source != null && source.getSymbolicName() != null) return source.getSymbolicName(); + return null; } @@ -830,7 +796,7 @@ public final class InternalPlatform { groupProviderTracker = new ServiceTracker<>(context, filter, null); groupProviderTracker.open(); - logReaderTracker = new ServiceTracker<>(context, ExtendedLogReaderService.class.getName(), null); + logReaderTracker = new ServiceTracker<>(context, ExtendedLogReaderService.class, null); logReaderTracker.open(); extendedLogTracker = new ServiceTracker<>(context, ExtendedLogService.class, null); @@ -863,11 +829,11 @@ public final class InternalPlatform { } private PackageAdmin getBundleAdmin() { - return bundleTracker == null ? null : (PackageAdmin) bundleTracker.getService(); + return bundleTracker == null ? null : bundleTracker.getService(); } private DebugOptions getDebugOptions() { - return debugTracker == null ? null : (DebugOptions) debugTracker.getService(); + return debugTracker == null ? null : debugTracker.getService(); } private void closeOSGITrackers() { diff -pruN 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/Log.java 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/Log.java --- 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/Log.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/Log.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.runtime/src/org/eclipse/core/internal/runtime/Messages.java 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/Messages.java --- 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/Messages.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/Messages.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/messages.properties 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/messages.properties --- 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/messages.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/messages.properties 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2000, 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.core.runtime/src/org/eclipse/core/internal/runtime/PerformanceStatsProcessor.java 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/PerformanceStatsProcessor.java --- 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/PerformanceStatsProcessor.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/PerformanceStatsProcessor.java 2018-09-06 10:51:21.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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/PlatformActivator.java 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/PlatformActivator.java --- 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/PlatformActivator.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/PlatformActivator.java 2018-09-06 10:51:21.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.core.runtime/src/org/eclipse/core/internal/runtime/Product.java 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/Product.java --- 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/Product.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/Product.java 2018-09-06 10:51:21.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.core.runtime/src/org/eclipse/core/runtime/ILibrary.java 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/ILibrary.java --- 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/ILibrary.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/ILibrary.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.runtime/src/org/eclipse/core/runtime/ILog.java 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/ILog.java --- 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/ILog.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/ILog.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.runtime/src/org/eclipse/core/runtime/IPlatformRunnable.java 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPlatformRunnable.java --- 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPlatformRunnable.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPlatformRunnable.java 2018-09-06 10:51:21.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.core.runtime/src/org/eclipse/core/runtime/IPluginDescriptor.java 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPluginDescriptor.java --- 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPluginDescriptor.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPluginDescriptor.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.runtime/src/org/eclipse/core/runtime/IPluginPrerequisite.java 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPluginPrerequisite.java --- 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPluginPrerequisite.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPluginPrerequisite.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.runtime/src/org/eclipse/core/runtime/IPluginRegistry.java 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPluginRegistry.java --- 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPluginRegistry.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPluginRegistry.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.runtime/src/org/eclipse/core/runtime/IProduct.java 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IProduct.java --- 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IProduct.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IProduct.java 2018-09-06 10:51:21.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.core.runtime/src/org/eclipse/core/runtime/IProductProvider.java 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IProductProvider.java --- 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IProductProvider.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IProductProvider.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 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.core.runtime/src/org/eclipse/core/runtime/PerformanceStats.java 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/PerformanceStats.java --- 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/PerformanceStats.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/PerformanceStats.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.runtime/src/org/eclipse/core/runtime/Platform.java 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java --- 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* - * Copyright (c) 2000, 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 + * Copyright (c) 2000, 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 @@ -27,7 +30,6 @@ import org.eclipse.osgi.service.debug.De import org.eclipse.osgi.service.environment.EnvironmentInfo; import org.eclipse.osgi.service.resolver.PlatformAdmin; import org.osgi.framework.Bundle; -import org.osgi.service.packageadmin.PackageAdmin; /** * The central class of the Eclipse Platform Runtime. This class cannot @@ -212,8 +214,9 @@ public final class Platform { * Note this constant has been moved from the deprecated * org.eclipse.core.boot.BootLoader class and its value has not changed. *

+ * * @since 3.0 - * * @deprecated not supported anymore + * @deprecated not supported anymore */ @Deprecated public static final String OS_AIX = "aix";//$NON-NLS-1$ @@ -300,8 +303,12 @@ public final class Platform { * Note this constant has been moved from the deprecated * org.eclipse.core.boot.BootLoader class and its value has not changed. *

+ * * @since 3.0 + * + * @deprecated not supported anymore */ + @Deprecated public static final String ARCH_PA_RISC = "PA_RISC";//$NON-NLS-1$ /** @@ -311,8 +318,12 @@ public final class Platform { * Note this constant has been moved from the deprecated * org.eclipse.core.boot.BootLoader class and its value has not changed. *

+ * * @since 3.0 + * + * @deprecated not supported anymore */ + @Deprecated public static final String ARCH_PPC = "ppc";//$NON-NLS-1$ /** @@ -322,8 +333,12 @@ public final class Platform { * Note this constant has been moved from the deprecated * org.eclipse.core.boot.BootLoader class and its value has not changed. *

+ * * @since 3.0 + * + * @deprecated not supported anymore */ + @Deprecated public static final String ARCH_SPARC = "sparc";//$NON-NLS-1$ /** @@ -350,7 +365,10 @@ public final class Platform { * IA64-based architecture. * * @since 3.0 + * + * @deprecated not supported anymore */ + @Deprecated public static final String ARCH_IA64 = "ia64"; //$NON-NLS-1$ /** @@ -358,7 +376,10 @@ public final class Platform { * IA64 32bit-based architecture. * * @since 3.1 + * + * @deprecated not supported anymore */ + @Deprecated public static final String ARCH_IA64_32 = "ia64_32";//$NON-NLS-1$ /** @@ -874,22 +895,22 @@ public final class Platform { } /** - * Returns a URL for the given path in the given bundle. Returns null if the URL - * could not be computed or created. + * Returns a URL for the given path in the given bundle. Returns + * null if the URL could not be computed or created. * * @param bundle the bundle in which to search - * @param path path relative to plug-in installation location - * @return a URL for the given path or null. The actual form - * of the returned URL is not specified. + * @param path path relative to plug-in installation location + * @return a URL for the given path or null. The actual form of the + * returned URL is not specified. * @see #find(Bundle, IPath, Map) * @see #resolve(URL) * @see #asLocalURL(URL) * @since 3.0 - * @deprecated use {@link FileLocator#find(Bundle, IPath, Map)} + * @deprecated use {@link FileLocator#find(Bundle, IPath)} */ @Deprecated public static URL find(Bundle bundle, IPath path) { - return FileLocator.find(bundle, path, null); + return FileLocator.find(bundle, path); } /** @@ -1329,12 +1350,15 @@ public final class Platform { /** * Checks if the specified bundle is a fragment bundle. *

- * Clients are also able to acquire the {@link PackageAdmin} service - * to query if the given bundle is a fragment by asking for the bundle type - * and checking against constants on the service interface. + * Clients are also able to acquire the + * {@link org.osgi.service.packageadmin.PackageAdmin} service to query if the + * given bundle is a fragment by asking for the bundle type and checking against + * constants on the service interface. *

+ * * @param bundle the bundle to query - * @return true if the specified bundle is a fragment bundle; otherwise false is returned. + * @return true if the specified bundle is a fragment bundle; otherwise false is + * returned. * @since 3.0 */ public static boolean isFragment(Bundle bundle) { @@ -1342,16 +1366,19 @@ public final class Platform { } /** - * Returns an array of attached fragment bundles for the specified bundle. If the - * specified bundle is a fragment then null is returned. If no fragments are - * attached to the specified bundle then null is returned. - *

- * Clients are also able to acquire the {@link PackageAdmin} service and query - * it for the fragments of the given bundle. + * Returns an array of attached fragment bundles for the specified bundle. If + * the specified bundle is a fragment then null is returned. If no + * fragments are attached to the specified bundle then null is + * returned. + *

+ * Clients are also able to acquire the + * {@link org.osgi.service.packageadmin.PackageAdmin} service and query it for + * the fragments of the given bundle. *

+ * * @param bundle the bundle to get the attached fragment bundles for. * @return an array of fragment bundles or null if the bundle does not - * have any attached fragment bundles. + * have any attached fragment bundles. * @since 3.0 */ public static Bundle[] getFragments(Bundle bundle) { @@ -1360,18 +1387,20 @@ public final class Platform { /** * Returns the resolved bundle with the specified symbolic name that has the - * highest version. If no resolved bundles are installed that have the - * specified symbolic name then null is returned. + * highest version. If no resolved bundles are installed that have the specified + * symbolic name then null is returned. *

- * Clients are also able to acquire the {@link PackageAdmin} service and query - * it for the bundle with the specified symbolic name. Clients can ask the - * service for all bundles with that particular name and then determine the - * one with the highest version. Note that clients may want to filter - * the results based on the state of the bundles. + * Clients are also able to acquire the + * {@link org.osgi.service.packageadmin.PackageAdmin} service and query it for + * the bundle with the specified symbolic name. Clients can ask the service for + * all bundles with that particular name and then determine the one with the + * highest version. Note that clients may want to filter the results based on + * the state of the bundles. *

+ * * @param symbolicName the symbolic name of the bundle to be returned. - * @return the bundle that has the specified symbolic name with the - * highest version, or null if no bundle is found. + * @return the bundle that has the specified symbolic name with the highest + * version, or null if no bundle is found. * @since 3.0 */ public static Bundle getBundle(String symbolicName) { @@ -1379,23 +1408,25 @@ public final class Platform { } /** - * Returns all bundles with the specified symbolic name. If no resolved bundles - * with the specified symbolic name can be found, null is returned. - * If the version argument is not null then only the Bundles that have - * the specified symbolic name and a version greater than or equal to the - * specified version are returned. The returned bundles are ordered in - * descending bundle version order. - *

- * Clients are also able to acquire the {@link PackageAdmin} service and query - * it for all bundle versions with the given symbolic name, after turning the - * specific version into a version range. Note that clients may want to filter - * the results based on the state of the bundles. + * Returns all bundles with the specified symbolic name. If no resolved bundles + * with the specified symbolic name can be found, null is returned. If + * the version argument is not null then only the Bundles that have the + * specified symbolic name and a version greater than or equal to the specified + * version are returned. The returned bundles are ordered in descending bundle + * version order. + *

+ * Clients are also able to acquire the + * {@link org.osgi.service.packageadmin.PackageAdmin} service and query it for + * all bundle versions with the given symbolic name, after turning the specific + * version into a version range. Note that clients may want to filter the + * results based on the state of the bundles. *

+ * * @param symbolicName the symbolic name of the bundles that are to be returned. - * @param version the version that the return bundle versions must match, - * or null if no version matching is to be done. - * @return the array of Bundles with the specified name that match the - * specified version and match rule, or null if no bundles are found. + * @param version the version that the return bundle versions must match, + * or null if no version matching is to be done. + * @return the array of Bundles with the specified name that match the specified + * version and match rule, or null if no bundles are found. */ public static Bundle[] getBundles(String symbolicName, String version) { return InternalPlatform.getDefault().getBundles(symbolicName, version); @@ -1403,15 +1434,17 @@ public final class Platform { /** * Returns an array of host bundles that the specified fragment bundle is - * attached to or null if the specified bundle is not attached to a host. - * If the bundle is not a fragment bundle then null is returned. + * attached to or null if the specified bundle is not attached to a + * host. If the bundle is not a fragment bundle then null is returned. *

- * Clients are also able to acquire the {@link PackageAdmin} service and query - * it for the hosts for the given bundle. + * Clients are also able to acquire the + * {@link org.osgi.service.packageadmin.PackageAdmin} service and query it for + * the hosts for the given bundle. *

+ * * @param bundle the bundle to get the host bundles for. - * @return an array of host bundles or null if the bundle does not have any - * host bundles. + * @return an array of host bundles or null if the bundle does not have any host + * bundles. * @since 3.0 */ public static Bundle[] getHosts(Bundle bundle) { diff -pruN 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Plugin.java 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Plugin.java --- 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Plugin.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Plugin.java 2018-09-06 10:51:21.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 diff -pruN 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Preferences.java 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Preferences.java --- 4.8-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Preferences.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Preferences.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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.core.tools/about.html 4.9-1/bundles/org.eclipse.core.tools/about.html --- 4.8-1/bundles/org.eclipse.core.tools/about.html 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/about.html 2018-09-06 10:51:21.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.core.tools/about.properties 4.9-1/bundles/org.eclipse.core.tools/about.properties --- 4.8-1/bundles/org.eclipse.core.tools/about.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/about.properties 2018-09-06 10:51:21.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.core.tools/build.properties 4.9-1/bundles/org.eclipse.core.tools/build.properties --- 4.8-1/bundles/org.eclipse.core.tools/build.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/build.properties 2018-09-06 10:51:21.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.core.tools/cpl-v10.html 4.9-1/bundles/org.eclipse.core.tools/cpl-v10.html --- 4.8-1/bundles/org.eclipse.core.tools/cpl-v10.html 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/cpl-v10.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,125 +0,0 @@ - - - -Common Public License - v 1.0 - - - - - - -

Common Public License - v 1.0 -

-

THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. -

-

1. DEFINITIONS -

"Contribution" means: - -

    a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
    -b) in the case of each subsequent Contributor:
- - -
    i) changes to the Program, and
- - -
    ii) additions to the Program;
- - -
    where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
- -

-

"Contributor" means any person or entity that distributes the Program. -

-

"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. -

-

"Program" means the Contributions distributed in accordance with this Agreement. -

-

"Recipient" means anyone who receives the Program under this Agreement, including all Contributors. -

-

2. GRANT OF RIGHTS - -

    a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
- - -
- - -
    b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
- - -
- - -
    c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
- - -
- - -
    d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
- - -
- -

3. REQUIREMENTS -

A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: - -

    a) it complies with the terms and conditions of this Agreement; and
- - -
    b) its license agreement:
- - -
    i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
- - -
    ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
- - -
    iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
- - -
    iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
- - -
- -

When the Program is made available in source code form: - -

    a) it must be made available under this Agreement; and
- - -
    b) a copy of this Agreement must be included with each copy of the Program.
- -

-

Contributors may not remove or alter any copyright notices contained within the Program. -

-

Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. -

-

4. COMMERCIAL DISTRIBUTION -

Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. -

-

For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. -

-

5. NO WARRANTY -

EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. -

-

6. DISCLAIMER OF LIABILITY -

EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -

-

7. GENERAL -

If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. -

-

If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. -

-

All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. -

-

Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. -

-

This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. -

-

- - - - \ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.core.tools/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.core.tools/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.core.tools/META-INF/MANIFEST.MF 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/META-INF/MANIFEST.MF 2018-09-06 10:51:21.000000000 +0000 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.core.tools; singleton:=true -Bundle-Version: 1.7.100.qualifier +Bundle-Version: 1.7.200.qualifier Bundle-Activator: org.eclipse.core.tools.CoreToolsPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff -pruN 4.8-1/bundles/org.eclipse.core.tools/plugin.properties 4.9-1/bundles/org.eclipse.core.tools/plugin.properties --- 4.8-1/bundles/org.eclipse.core.tools/plugin.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/plugin.properties 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2000, 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.core.tools/pom.xml 4.9-1/bundles/org.eclipse.core.tools/pom.xml --- 4.8-1/bundles/org.eclipse.core.tools/pom.xml 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/pom.xml 2018-09-06 10:51:21.000000000 +0000 @@ -14,12 +14,12 @@ eclipse.platform.runtime eclipse.platform.runtime - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.core org.eclipse.core.tools - 1.7.100-SNAPSHOT + 1.7.200-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.core.tools/.settings/org.eclipse.jdt.ui.prefs 4.9-1/bundles/org.eclipse.core.tools/.settings/org.eclipse.jdt.ui.prefs --- 4.8-1/bundles/org.eclipse.core.tools/.settings/org.eclipse.jdt.ui.prefs 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/.settings/org.eclipse.jdt.ui.prefs 2018-09-06 10:51:21.000000000 +0000 @@ -66,7 +66,7 @@ org.eclipse.jdt.ui.importorder=; org.eclipse.jdt.ui.javadoc=false org.eclipse.jdt.ui.ondemandthreshold=3 org.eclipse.jdt.ui.staticondemandthreshold=99 -org.eclipse.jdt.ui.text.custom_code_templates= +org.eclipse.jdt.ui.text.custom_code_templates= sp_cleanup.add_default_serial_version_id=false sp_cleanup.add_generated_serial_version_id=false sp_cleanup.add_missing_annotations=true diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/AbstractCopySelectionAction.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/AbstractCopySelectionAction.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/AbstractCopySelectionAction.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/AbstractCopySelectionAction.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/AbstractTreeContentProvider.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/AbstractTreeContentProvider.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/AbstractTreeContentProvider.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/AbstractTreeContentProvider.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/BaseTextView.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/BaseTextView.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/BaseTextView.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/BaseTextView.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ByteUtil.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ByteUtil.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ByteUtil.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ByteUtil.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ClearTextAction.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ClearTextAction.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ClearTextAction.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ClearTextAction.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CollapseAllAction.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CollapseAllAction.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CollapseAllAction.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CollapseAllAction.java 2018-09-06 10:51:21.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.core.tools/src/org/eclipse/core/tools/CopyStructuredSelectionAction.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CopyStructuredSelectionAction.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CopyStructuredSelectionAction.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CopyStructuredSelectionAction.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CopyTextSelectionAction.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CopyTextSelectionAction.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CopyTextSelectionAction.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CopyTextSelectionAction.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CoreToolsPlugin.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CoreToolsPlugin.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CoreToolsPlugin.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CoreToolsPlugin.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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.core.tools/src/org/eclipse/core/tools/DeepSize.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/DeepSize.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/DeepSize.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/DeepSize.java 2018-09-06 10:51:21.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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ErrorUtil.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ErrorUtil.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ErrorUtil.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ErrorUtil.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/GlobalAction.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/GlobalAction.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/GlobalAction.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/GlobalAction.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/IFlattable.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/IFlattable.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/IFlattable.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/IFlattable.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ISorter.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ISorter.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ISorter.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ISorter.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ITreeNodeVisitor.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ITreeNodeVisitor.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ITreeNodeVisitor.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ITreeNodeVisitor.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/Messages.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/Messages.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/Messages.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/Messages.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,8 +1,11 @@ /********************************************************************** - * Copyright (c) 2005, 2007 IBM Corporation and others. All rights reserved. This +. +. 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 +t https://www.eclipse.org/legal/epl-2.0/ +t +t SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/messages.properties 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/messages.properties --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/messages.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/messages.properties 2018-09-06 10:51:21.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.core.tools/src/org/eclipse/core/tools/metadata/AbstractDumper.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/AbstractDumper.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/AbstractDumper.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/AbstractDumper.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpContentsView.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpContentsView.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpContentsView.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpContentsView.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumperFactory.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumperFactory.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumperFactory.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumperFactory.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpException.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpException.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpException.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpException.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/Dump.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/Dump.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/Dump.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/Dump.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpSummaryView.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpSummaryView.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpSummaryView.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpSummaryView.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpTool.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpTool.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpTool.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpTool.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/IDumper.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/IDumper.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/IDumper.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/IDumper.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/IDump.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/IDump.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/IDump.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/IDump.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/IStringDumpingStrategy.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/IStringDumpingStrategy.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/IStringDumpingStrategy.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/IStringDumpingStrategy.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataFileFilter.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataFileFilter.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataFileFilter.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataFileFilter.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataPerspective.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataPerspective.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataPerspective.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataPerspective.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataTreeContentProvider.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataTreeContentProvider.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataTreeContentProvider.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataTreeContentProvider.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataTreeView.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataTreeView.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataTreeView.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataTreeView.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MeteredInputStream.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MeteredInputStream.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MeteredInputStream.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MeteredInputStream.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MultiStrategyDumper.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MultiStrategyDumper.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MultiStrategyDumper.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MultiStrategyDumper.java 2018-09-06 10:51:21.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.core.tools/src/org/eclipse/core/tools/metadata/PartialDumpException.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/PartialDumpException.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/PartialDumpException.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/PartialDumpException.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 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.core.tools/src/org/eclipse/core/tools/metadata/StateDumper.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/StateDumper.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/StateDumper.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/StateDumper.java 2018-09-06 10:51:21.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.core.tools/src/org/eclipse/core/tools/nls/ConvertMessageBundleAction.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/ConvertMessageBundleAction.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/ConvertMessageBundleAction.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/ConvertMessageBundleAction.java 2018-09-06 10:51:21.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.core.tools/src/org/eclipse/core/tools/nls/GotoResourceAction.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/GotoResourceAction.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/GotoResourceAction.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/GotoResourceAction.java 2018-09-06 10:51:21.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.core.tools/src/org/eclipse/core/tools/nls/IntegerMap.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/IntegerMap.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/IntegerMap.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/IntegerMap.java 2018-09-06 10:51:21.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.core.tools/src/org/eclipse/core/tools/nls/MessageBundleRefactoring.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/MessageBundleRefactoring.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/MessageBundleRefactoring.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/MessageBundleRefactoring.java 2018-09-06 10:51:21.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.core.tools/src/org/eclipse/core/tools/nls/NLSFileChange.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/NLSFileChange.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/NLSFileChange.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/NLSFileChange.java 2018-09-06 10:51:21.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.core.tools/src/org/eclipse/core/tools/nls/PropertyFileConverter.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/PropertyFileConverter.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/PropertyFileConverter.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/PropertyFileConverter.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,12 +1,16 @@ -/********************************************************************** - * 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 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html +/******************************************************************************* + * Copyright (c) 2005 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 - Initial API and implementation - **********************************************************************/ + * IBM Corporation - initial API and implementation + *******************************************************************************/ package org.eclipse.core.tools.nls; import java.io.*; @@ -90,10 +94,14 @@ public class PropertyFileConverter { private void appendPreText(StringBuilder buffer, String pkgName, String bundleName, String typeName) { //if this text had typos, would it be a false pretext? buffer.append("/**********************************************************************\n"); //$NON-NLS-1$ - buffer.append(" * Copyright (c) 2005 IBM Corporation and others. All rights reserved. This\n"); //$NON-NLS-1$ - buffer.append(" * program and the accompanying materials are made available under the terms of\n"); //$NON-NLS-1$ - buffer.append(" * the Eclipse Public License v1.0 which accompanies this distribution, and is\n"); //$NON-NLS-1$ - buffer.append(" * available at http://www.eclipse.org/legal/epl-v10.html\n"); //$NON-NLS-1$ + buffer.append(" * Copyright (c) 2005 IBM Corporation and others.\n"); //$NON-NLS-1$ + buffer.append(" *\n"); //$NON-NLS-1$ + buffer.append(" * This program and the accompanying materials are made available under the terms of\n"); //$NON-NLS-1$ + buffer.append(" * the Eclipse Public License 2.0 which accompanies this distribution, and is\n"); //$NON-NLS-1$ + buffer.append(" * available at\n"); //$NON-NLS-1$ + buffer.append(" * https://www.eclipse.org/legal/epl-2.0/\n"); //$NON-NLS-1$ + buffer.append(" * \n"); //$NON-NLS-1$ + buffer.append(" * SPDX-License-Identifier: EPL-2.0\n"); //$NON-NLS-1$ buffer.append(" * \n"); //$NON-NLS-1$ buffer.append(" * Contributors: \n"); //$NON-NLS-1$ buffer.append(" * IBM - Initial API and implementation\n"); //$NON-NLS-1$ diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/RemoveUnusedMessagesAction.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/RemoveUnusedMessagesAction.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/RemoveUnusedMessagesAction.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/RemoveUnusedMessagesAction.java 2018-09-06 10:51:21.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.core.tools/src/org/eclipse/core/tools/nls/RemoveUnusedMessages.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/RemoveUnusedMessages.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/RemoveUnusedMessages.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/RemoveUnusedMessages.java 2018-09-06 10:51:21.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.core.tools/src/org/eclipse/core/tools/runtime/ContentTypePropertySource.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/ContentTypePropertySource.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/ContentTypePropertySource.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/ContentTypePropertySource.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /********************************************************************** * Copyright (c) 2003, 2004 Geoff Longman and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Geoff Longman - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/ContentTypeView.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/ContentTypeView.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/ContentTypeView.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/ContentTypeView.java 2018-09-06 10:51:21.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.core.tools/src/org/eclipse/core/tools/runtime/EclipsePreferencesView.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EclipsePreferencesView.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EclipsePreferencesView.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EclipsePreferencesView.java 2018-09-06 10:51:21.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.core.tools/src/org/eclipse/core/tools/runtime/EventsSorter.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EventsSorter.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EventsSorter.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EventsSorter.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EventsView.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EventsView.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EventsView.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EventsView.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginDependencyGraphNode.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginDependencyGraphNode.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginDependencyGraphNode.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginDependencyGraphNode.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginDependencyPerspective.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginDependencyPerspective.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginDependencyPerspective.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginDependencyPerspective.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginDependencyView.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginDependencyView.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginDependencyView.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginDependencyView.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginListView.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginListView.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginListView.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginListView.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PreferenceStatsView.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PreferenceStatsView.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PreferenceStatsView.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PreferenceStatsView.java 2018-09-06 10:51:21.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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/RuntimeSpyPerspective.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/RuntimeSpyPerspective.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/RuntimeSpyPerspective.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/RuntimeSpyPerspective.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/StackTraceView.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/StackTraceView.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/StackTraceView.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/StackTraceView.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/VMClassInfo.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/VMClassInfo.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/VMClassInfo.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/VMClassInfo.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/VMClassloaderInfo.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/VMClassloaderInfo.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/VMClassloaderInfo.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/VMClassloaderInfo.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnreferencedFilesAction.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnreferencedFilesAction.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnreferencedFilesAction.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnreferencedFilesAction.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 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.core.tools/src/org/eclipse/core/tools/search/FindUnusedMemberHandler.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedMemberHandler.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedMemberHandler.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedMemberHandler.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2015, 2018 vogella GmbH and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * vogella GmbH - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedMembers.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedMembers.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedMembers.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedMembers.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 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.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchQuery.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchQuery.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchQuery.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchQuery.java 2018-09-06 10:51:21.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.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchResult.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchResult.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchResult.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchResult.java 2018-09-06 10:51:21.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.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchResultPage.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchResultPage.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchResultPage.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchResultPage.java 2018-09-06 10:51:21.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.core.tools/src/org/eclipse/core/tools/SelectAllAction.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/SelectAllAction.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/SelectAllAction.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/SelectAllAction.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/SpyView.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/SpyView.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/SpyView.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/SpyView.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableSelectionProviderDecorator.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableSelectionProviderDecorator.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableSelectionProviderDecorator.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableSelectionProviderDecorator.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableWithTotalView.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableWithTotalView.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableWithTotalView.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableWithTotalView.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeContentProviderNode.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeContentProviderNode.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeContentProviderNode.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeContentProviderNode.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeSelectionProviderDecorator.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeSelectionProviderDecorator.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeSelectionProviderDecorator.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeSelectionProviderDecorator.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeTextOperationTarget.java 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeTextOperationTarget.java --- 4.8-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeTextOperationTarget.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeTextOperationTarget.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2002, 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 - Initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.contexts/about.html 4.9-1/bundles/org.eclipse.e4.core.contexts/about.html --- 4.8-1/bundles/org.eclipse.e4.core.contexts/about.html 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.contexts/about.html 2018-09-06 10:51:21.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

About This Content

- -

November 20, 2008

-

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.e4.core.contexts/build.properties 4.9-1/bundles/org.eclipse.e4.core.contexts/build.properties --- 4.8-1/bundles/org.eclipse.e4.core.contexts/build.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.contexts/build.properties 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2010, 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.e4.core.contexts/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.e4.core.contexts/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.e4.core.contexts/META-INF/MANIFEST.MF 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.contexts/META-INF/MANIFEST.MF 2018-09-06 10:51:21.000000000 +0000 @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.e4.core.contexts -Bundle-Version: 1.7.0.qualifier +Bundle-Version: 1.7.100.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin diff -pruN 4.8-1/bundles/org.eclipse.e4.core.contexts/plugin.properties 4.9-1/bundles/org.eclipse.e4.core.contexts/plugin.properties --- 4.8-1/bundles/org.eclipse.e4.core.contexts/plugin.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.contexts/plugin.properties 2018-09-06 10:51:21.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.e4.core.contexts/pom.xml 4.9-1/bundles/org.eclipse.e4.core.contexts/pom.xml --- 4.8-1/bundles/org.eclipse.e4.core.contexts/pom.xml 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.contexts/pom.xml 2018-09-06 10:51:21.000000000 +0000 @@ -14,11 +14,11 @@ eclipse.platform.runtime eclipse.platform.runtime - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.e4 org.eclipse.e4.core.contexts - 1.7.0-SNAPSHOT + 1.7.100-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/Active.java 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/Active.java --- 4.8-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/Active.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/Active.java 2018-09-06 10:51:21.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.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextFunction.java 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextFunction.java --- 4.8-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextFunction.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextFunction.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 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.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextInjectionFactory.java 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextInjectionFactory.java --- 4.8-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextInjectionFactory.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextInjectionFactory.java 2018-09-06 10:51:21.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.e4.core.contexts/src/org/eclipse/e4/core/contexts/EclipseContextFactory.java 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/EclipseContextFactory.java --- 4.8-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/EclipseContextFactory.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/EclipseContextFactory.java 2018-09-06 10:51:21.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.e4.core.contexts/src/org/eclipse/e4/core/contexts/IContextFunction.java 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/IContextFunction.java --- 4.8-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/IContextFunction.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/IContextFunction.java 2018-09-06 10:51:21.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.e4.core.contexts/src/org/eclipse/e4/core/contexts/IEclipseContext.java 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/IEclipseContext.java --- 4.8-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/IEclipseContext.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/IEclipseContext.java 2018-09-06 10:51:21.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.e4.core.contexts/src/org/eclipse/e4/core/contexts/RunAndTrack.java 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/RunAndTrack.java --- 4.8-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/RunAndTrack.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/RunAndTrack.java 2018-09-06 10:51:21.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.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/Computation.java 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/Computation.java --- 4.8-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/Computation.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/Computation.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 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.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/ContextChangeEvent.java 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/ContextChangeEvent.java --- 4.8-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/ContextChangeEvent.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/ContextChangeEvent.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 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.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/ContextObjectSupplier.java 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/ContextObjectSupplier.java --- 4.8-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/ContextObjectSupplier.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/ContextObjectSupplier.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 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.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/EclipseContext.java 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/EclipseContext.java --- 4.8-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/EclipseContext.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/EclipseContext.java 2018-09-06 10:51:21.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.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/IContextDisposalListener.java 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/IContextDisposalListener.java --- 4.8-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/IContextDisposalListener.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/IContextDisposalListener.java 2018-09-06 10:51:21.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.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/IEclipseContextDebugger.java 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/IEclipseContextDebugger.java --- 4.8-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/IEclipseContextDebugger.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/IEclipseContextDebugger.java 2018-09-06 10:51:21.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.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/osgi/ContextDebugHelper.java 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/osgi/ContextDebugHelper.java --- 4.8-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/osgi/ContextDebugHelper.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/osgi/ContextDebugHelper.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 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.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/osgi/EclipseContextOSGi.java 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/osgi/EclipseContextOSGi.java --- 4.8-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/osgi/EclipseContextOSGi.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/osgi/EclipseContextOSGi.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2011, 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.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/RunAndTrackExt.java 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/RunAndTrackExt.java --- 4.8-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/RunAndTrackExt.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/RunAndTrackExt.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 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.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/TrackableComputationExt.java 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/TrackableComputationExt.java --- 4.8-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/TrackableComputationExt.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/TrackableComputationExt.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 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.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/ValueComputation.java 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/ValueComputation.java --- 4.8-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/ValueComputation.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/ValueComputation.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 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.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/WeakGroupedListenerList.java 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/WeakGroupedListenerList.java --- 4.8-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/WeakGroupedListenerList.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/WeakGroupedListenerList.java 2018-09-06 10:51:21.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.e4.core.di/about.html 4.9-1/bundles/org.eclipse.e4.core.di/about.html --- 4.8-1/bundles/org.eclipse.e4.core.di/about.html 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di/about.html 2018-09-06 10:51:21.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

About This Content

- -

November 20, 2008

-

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.e4.core.di/build.properties 4.9-1/bundles/org.eclipse.e4.core.di/build.properties --- 4.8-1/bundles/org.eclipse.e4.core.di/build.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di/build.properties 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2010, 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.e4.core.di/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.e4.core.di/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.e4.core.di/META-INF/MANIFEST.MF 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di/META-INF/MANIFEST.MF 2018-09-06 10:51:21.000000000 +0000 @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.e4.core.di -Bundle-Version: 1.7.0.qualifier +Bundle-Version: 1.7.100.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin diff -pruN 4.8-1/bundles/org.eclipse.e4.core.di/plugin.properties 4.9-1/bundles/org.eclipse.e4.core.di/plugin.properties --- 4.8-1/bundles/org.eclipse.e4.core.di/plugin.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di/plugin.properties 2018-09-06 10:51:21.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.e4.core.di/pom.xml 4.9-1/bundles/org.eclipse.e4.core.di/pom.xml --- 4.8-1/bundles/org.eclipse.e4.core.di/pom.xml 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di/pom.xml 2018-09-06 10:51:21.000000000 +0000 @@ -14,11 +14,11 @@ eclipse.platform.runtime eclipse.platform.runtime - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.e4 org.eclipse.e4.core.di - 1.7.0-SNAPSHOT + 1.7.100-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/IBinding.java 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/IBinding.java --- 4.8-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/IBinding.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/IBinding.java 2018-09-06 10:51:21.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.e4.core.di/src/org/eclipse/e4/core/di/IInjector.java 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/IInjector.java --- 4.8-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/IInjector.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/IInjector.java 2018-09-06 10:51:21.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.e4.core.di/src/org/eclipse/e4/core/di/InjectionException.java 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/InjectionException.java --- 4.8-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/InjectionException.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/InjectionException.java 2018-09-06 10:51:21.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.e4.core.di/src/org/eclipse/e4/core/di/InjectorFactory.java 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/InjectorFactory.java --- 4.8-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/InjectorFactory.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/InjectorFactory.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 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.e4.core.di/src/org/eclipse/e4/core/di/suppliers/ExtendedObjectSupplier.java 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/suppliers/ExtendedObjectSupplier.java --- 4.8-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/suppliers/ExtendedObjectSupplier.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/suppliers/ExtendedObjectSupplier.java 2018-09-06 10:51:21.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.e4.core.di/src/org/eclipse/e4/core/di/suppliers/IObjectDescriptor.java 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/suppliers/IObjectDescriptor.java --- 4.8-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/suppliers/IObjectDescriptor.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/suppliers/IObjectDescriptor.java 2018-09-06 10:51:21.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.e4.core.di/src/org/eclipse/e4/core/di/suppliers/IRequestor.java 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/suppliers/IRequestor.java --- 4.8-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/suppliers/IRequestor.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/suppliers/IRequestor.java 2018-09-06 10:51:21.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.e4.core.di/src/org/eclipse/e4/core/di/suppliers/PrimaryObjectSupplier.java 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/suppliers/PrimaryObjectSupplier.java --- 4.8-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/suppliers/PrimaryObjectSupplier.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/suppliers/PrimaryObjectSupplier.java 2018-09-06 10:51:21.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.e4.core.di/src/org/eclipse/e4/core/internal/di/Binding.java 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/Binding.java --- 4.8-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/Binding.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/Binding.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 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.e4.core.di/src/org/eclipse/e4/core/internal/di/ClassRequestor.java 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/ClassRequestor.java --- 4.8-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/ClassRequestor.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/ClassRequestor.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 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.e4.core.di/src/org/eclipse/e4/core/internal/di/ConstructorRequestor.java 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/ConstructorRequestor.java --- 4.8-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/ConstructorRequestor.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/ConstructorRequestor.java 2018-09-06 10:51:21.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.e4.core.di/src/org/eclipse/e4/core/internal/di/FieldRequestor.java 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/FieldRequestor.java --- 4.8-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/FieldRequestor.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/FieldRequestor.java 2018-09-06 10:51:21.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.e4.core.di/src/org/eclipse/e4/core/internal/di/InjectorImpl.java 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/InjectorImpl.java --- 4.8-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/InjectorImpl.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/InjectorImpl.java 2018-09-06 10:51:21.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 @@ -25,7 +28,6 @@ import java.security.CodeSource; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -382,13 +384,10 @@ public class InjectorImpl implements IIn ArrayList> sortedConstructors = new ArrayList<>(constructors.length); for (Constructor constructor : constructors) sortedConstructors.add(constructor); - Collections.sort(sortedConstructors, new Comparator>() { - @Override - public int compare(Constructor c1, Constructor c2) { - int l1 = c1.getParameterTypes().length; - int l2 = c2.getParameterTypes().length; - return l2 - l1; - } + Collections.sort(sortedConstructors, (c1, c2) -> { + int l1 = c1.getParameterTypes().length; + int l2 = c2.getParameterTypes().length; + return l2 - l1; }); for (Constructor constructor : sortedConstructors) { @@ -822,13 +821,10 @@ public class InjectorImpl implements IIn constructors = c.getDeclaredConstructors(); // Sort the constructors by descending number of constructor // arguments - Arrays.sort(constructors, new Comparator>() { - @Override - public int compare(Constructor c1, Constructor c2) { - int l1 = c1.getParameterTypes().length; - int l2 = c2.getParameterTypes().length; - return l2 - l1; - } + Arrays.sort(constructors, (c1, c2) -> { + int l1 = c1.getParameterTypes().length; + int l2 = c2.getParameterTypes().length; + return l2 - l1; }); constructorsCache.put(c, constructors); } diff -pruN 4.8-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/MethodRequestor.java 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/MethodRequestor.java --- 4.8-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/MethodRequestor.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/MethodRequestor.java 2018-09-06 10:51:21.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.e4.core.di/src/org/eclipse/e4/core/internal/di/ObjectDescriptor.java 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/ObjectDescriptor.java --- 4.8-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/ObjectDescriptor.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/ObjectDescriptor.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 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.e4.core.di/src/org/eclipse/e4/core/internal/di/osgi/LogHelper.java 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/osgi/LogHelper.java --- 4.8-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/osgi/LogHelper.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/osgi/LogHelper.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 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.e4.core.di/src/org/eclipse/e4/core/internal/di/osgi/ProviderHelper.java 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/osgi/ProviderHelper.java --- 4.8-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/osgi/ProviderHelper.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/osgi/ProviderHelper.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 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 @@ -24,8 +27,6 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.InvalidSyntaxException; -import org.osgi.framework.ServiceEvent; -import org.osgi.framework.ServiceListener; import org.osgi.framework.ServiceReference; /** @@ -43,12 +44,9 @@ public class ProviderHelper { BundleContext bundleContext = bundle.getBundleContext(); String filter = '(' + Constants.OBJECTCLASS + '=' + ExtendedObjectSupplier.SERVICE_NAME + ')'; try { - bundleContext.addServiceListener(new ServiceListener() { - @Override - public void serviceChanged(ServiceEvent event) { - synchronized (extendedSuppliers) { - extendedSuppliers.clear(); - } + bundleContext.addServiceListener(event -> { + synchronized (extendedSuppliers) { + extendedSuppliers.clear(); } }, filter); } catch (InvalidSyntaxException e) { diff -pruN 4.8-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/ProviderImpl.java 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/ProviderImpl.java --- 4.8-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/ProviderImpl.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/ProviderImpl.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 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.e4.core.di/src/org/eclipse/e4/core/internal/di/Requestor.java 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/Requestor.java --- 4.8-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/Requestor.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/Requestor.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 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.e4.core.di/src/org/eclipse/e4/core/internal/di/shared/CoreLogger.java 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/shared/CoreLogger.java --- 4.8-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/shared/CoreLogger.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/shared/CoreLogger.java 2018-09-06 10:51:21.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.e4.core.di/src/org/eclipse/e4/core/internal/di/WeakRefList.java 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/WeakRefList.java --- 4.8-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/WeakRefList.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/WeakRefList.java 2018-09-06 10:51:21.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.e4.core.di.annotations/about.html 4.9-1/bundles/org.eclipse.e4.core.di.annotations/about.html --- 4.8-1/bundles/org.eclipse.e4.core.di.annotations/about.html 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di.annotations/about.html 2018-09-06 10:51:21.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

About This Content

- -

November 20, 2008

-

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.e4.core.di.annotations/build.properties 4.9-1/bundles/org.eclipse.e4.core.di.annotations/build.properties --- 4.8-1/bundles/org.eclipse.e4.core.di.annotations/build.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di.annotations/build.properties 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2010, 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.e4.core.di.annotations/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.e4.core.di.annotations/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.e4.core.di.annotations/META-INF/MANIFEST.MF 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di.annotations/META-INF/MANIFEST.MF 2018-09-06 10:51:21.000000000 +0000 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.e4.core.di.annotations -Bundle-Version: 1.6.100.qualifier +Bundle-Version: 1.6.200.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.e4.core.di.annotations;version="1.6.0" Import-Package: javax.inject;version="1.0.0" diff -pruN 4.8-1/bundles/org.eclipse.e4.core.di.annotations/pom.xml 4.9-1/bundles/org.eclipse.e4.core.di.annotations/pom.xml --- 4.8-1/bundles/org.eclipse.e4.core.di.annotations/pom.xml 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di.annotations/pom.xml 2018-09-06 10:51:21.000000000 +0000 @@ -14,11 +14,11 @@ eclipse.platform.runtime eclipse.platform.runtime - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.e4 org.eclipse.e4.core.di.annotations - 1.6.100-SNAPSHOT + 1.6.200-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.e4.core.di.annotations/src/org/eclipse/e4/core/di/annotations/CanExecute.java 4.9-1/bundles/org.eclipse.e4.core.di.annotations/src/org/eclipse/e4/core/di/annotations/CanExecute.java --- 4.8-1/bundles/org.eclipse.e4.core.di.annotations/src/org/eclipse/e4/core/di/annotations/CanExecute.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di.annotations/src/org/eclipse/e4/core/di/annotations/CanExecute.java 2018-09-06 10:51:21.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.e4.core.di.annotations/src/org/eclipse/e4/core/di/annotations/Creatable.java 4.9-1/bundles/org.eclipse.e4.core.di.annotations/src/org/eclipse/e4/core/di/annotations/Creatable.java --- 4.8-1/bundles/org.eclipse.e4.core.di.annotations/src/org/eclipse/e4/core/di/annotations/Creatable.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di.annotations/src/org/eclipse/e4/core/di/annotations/Creatable.java 2018-09-06 10:51:21.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.e4.core.di.annotations/src/org/eclipse/e4/core/di/annotations/Evaluate.java 4.9-1/bundles/org.eclipse.e4.core.di.annotations/src/org/eclipse/e4/core/di/annotations/Evaluate.java --- 4.8-1/bundles/org.eclipse.e4.core.di.annotations/src/org/eclipse/e4/core/di/annotations/Evaluate.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di.annotations/src/org/eclipse/e4/core/di/annotations/Evaluate.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2016 vogella GmbH and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Simon Scholz - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.di.annotations/src/org/eclipse/e4/core/di/annotations/Execute.java 4.9-1/bundles/org.eclipse.e4.core.di.annotations/src/org/eclipse/e4/core/di/annotations/Execute.java --- 4.8-1/bundles/org.eclipse.e4.core.di.annotations/src/org/eclipse/e4/core/di/annotations/Execute.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di.annotations/src/org/eclipse/e4/core/di/annotations/Execute.java 2018-09-06 10:51:21.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.e4.core.di.annotations/src/org/eclipse/e4/core/di/annotations/GroupUpdates.java 4.9-1/bundles/org.eclipse.e4.core.di.annotations/src/org/eclipse/e4/core/di/annotations/GroupUpdates.java --- 4.8-1/bundles/org.eclipse.e4.core.di.annotations/src/org/eclipse/e4/core/di/annotations/GroupUpdates.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di.annotations/src/org/eclipse/e4/core/di/annotations/GroupUpdates.java 2018-09-06 10:51:21.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.e4.core.di.annotations/src/org/eclipse/e4/core/di/annotations/Optional.java 4.9-1/bundles/org.eclipse.e4.core.di.annotations/src/org/eclipse/e4/core/di/annotations/Optional.java --- 4.8-1/bundles/org.eclipse.e4.core.di.annotations/src/org/eclipse/e4/core/di/annotations/Optional.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di.annotations/src/org/eclipse/e4/core/di/annotations/Optional.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 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.e4.core.di.extensions/about.html 4.9-1/bundles/org.eclipse.e4.core.di.extensions/about.html --- 4.8-1/bundles/org.eclipse.e4.core.di.extensions/about.html 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di.extensions/about.html 2018-09-06 10:51:21.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

About This Content

- -

November 20, 2008

-

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.e4.core.di.extensions/build.properties 4.9-1/bundles/org.eclipse.e4.core.di.extensions/build.properties --- 4.8-1/bundles/org.eclipse.e4.core.di.extensions/build.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di.extensions/build.properties 2018-09-06 10:51:21.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.e4.core.di.extensions/fragment.properties 4.9-1/bundles/org.eclipse.e4.core.di.extensions/fragment.properties --- 4.8-1/bundles/org.eclipse.e4.core.di.extensions/fragment.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di.extensions/fragment.properties 2018-09-06 10:51:21.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.e4.core.di.extensions/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.e4.core.di.extensions/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.e4.core.di.extensions/META-INF/MANIFEST.MF 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di.extensions/META-INF/MANIFEST.MF 2018-09-06 10:51:21.000000000 +0000 @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.e4.core.di.extensions;singleton:=true -Bundle-Version: 0.15.100.qualifier +Bundle-Version: 0.15.200.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.e4.core.di.extensions;version="0.15.0";x-friends:="org.eclipse.e4.core.di.extensions.supplier" diff -pruN 4.8-1/bundles/org.eclipse.e4.core.di.extensions/pom.xml 4.9-1/bundles/org.eclipse.e4.core.di.extensions/pom.xml --- 4.8-1/bundles/org.eclipse.e4.core.di.extensions/pom.xml 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di.extensions/pom.xml 2018-09-06 10:51:21.000000000 +0000 @@ -14,11 +14,11 @@ eclipse.platform.runtime eclipse.platform.runtime - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.e4 org.eclipse.e4.core.di.extensions - 0.15.100-SNAPSHOT + 0.15.200-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/EventTopic.java 4.9-1/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/EventTopic.java --- 4.8-1/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/EventTopic.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/EventTopic.java 2018-09-06 10:51:21.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.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/OSGiBundle.java 4.9-1/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/OSGiBundle.java --- 4.8-1/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/OSGiBundle.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/OSGiBundle.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,8 +1,11 @@ /******************************************************************************* - * Copyright (c) 2013 Markus Alexander Kuppe and others. All rights reserved. + * Copyright (c) 2013 Markus Alexander Kuppe 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 + * of the Eclipse Public License 2.0 which accompanies this distribution, and is +t https://www.eclipse.org/legal/epl-2.0/ +t +t SPDX-License-Identifier: EPL-2.0 * * Contributors: * Markus Alexander Kuppe - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/Preference.java 4.9-1/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/Preference.java --- 4.8-1/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/Preference.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/Preference.java 2018-09-06 10:51:21.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.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/Service.java 4.9-1/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/Service.java --- 4.8-1/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/Service.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/Service.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2014 BestSolution.at and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.di.extensions.supplier/about.html 4.9-1/bundles/org.eclipse.e4.core.di.extensions.supplier/about.html --- 4.8-1/bundles/org.eclipse.e4.core.di.extensions.supplier/about.html 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di.extensions.supplier/about.html 2018-09-06 10:51:21.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

About This Content

- -

November 20, 2008

-

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.e4.core.di.extensions.supplier/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.e4.core.di.extensions.supplier/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.e4.core.di.extensions.supplier/META-INF/MANIFEST.MF 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di.extensions.supplier/META-INF/MANIFEST.MF 2018-09-06 10:51:21.000000000 +0000 @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-SymbolicName: org.eclipse.e4.core.di.extensions.supplier -Bundle-Version: 0.15.100.qualifier +Bundle-Version: 0.15.200.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Capability: osgi.extender; filter:="(&(osgi.extender=osgi.component)(version>=1.3)(!(version>=2.0)))" diff -pruN 4.8-1/bundles/org.eclipse.e4.core.di.extensions.supplier/pom.xml 4.9-1/bundles/org.eclipse.e4.core.di.extensions.supplier/pom.xml --- 4.8-1/bundles/org.eclipse.e4.core.di.extensions.supplier/pom.xml 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di.extensions.supplier/pom.xml 2018-09-06 10:51:21.000000000 +0000 @@ -14,11 +14,11 @@ eclipse.platform.runtime eclipse.platform.runtime - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.e4 org.eclipse.e4.core.di.extensions.supplier - 0.15.100-SNAPSHOT + 0.15.200-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/EventObjectSupplier.java 4.9-1/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/EventObjectSupplier.java --- 4.8-1/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/EventObjectSupplier.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/EventObjectSupplier.java 2018-09-06 10:51:21.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.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/OSGiObjectSupplier.java 4.9-1/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/OSGiObjectSupplier.java --- 4.8-1/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/OSGiObjectSupplier.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/OSGiObjectSupplier.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,8 +1,11 @@ /******************************************************************************* - * Copyright (c) 2013, 2017 Markus Alexander Kuppe and others. All rights reserved. + * Copyright (c) 2013, 2017 Markus Alexander Kuppe 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 + * of the Eclipse Public License 2.0 which accompanies this distribution, and is +t https://www.eclipse.org/legal/epl-2.0/ +t +t SPDX-License-Identifier: EPL-2.0 * * Contributors: * Markus Alexander Kuppe - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/PreferencesObjectSupplier.java 4.9-1/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/PreferencesObjectSupplier.java --- 4.8-1/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/PreferencesObjectSupplier.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/PreferencesObjectSupplier.java 2018-09-06 10:51:21.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.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/ServiceSupplier.java 4.9-1/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/ServiceSupplier.java --- 4.8-1/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/ServiceSupplier.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/ServiceSupplier.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2014, 2018 BestSolution.at and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/util/EventUtils.java 4.9-1/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/util/EventUtils.java --- 4.8-1/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/util/EventUtils.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/util/EventUtils.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 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.e4.core.services/about.html 4.9-1/bundles/org.eclipse.e4.core.services/about.html --- 4.8-1/bundles/org.eclipse.e4.core.services/about.html 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/about.html 2018-09-06 10:51:21.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

About This Content

- -

November 20, 2008

-

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.e4.core.services/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF 2018-09-06 10:51:21.000000000 +0000 @@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.e4.core Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-Version: 2.1.100.qualifier +Bundle-Version: 2.1.200.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.annotation, diff -pruN 4.8-1/bundles/org.eclipse.e4.core.services/plugin.properties 4.9-1/bundles/org.eclipse.e4.core.services/plugin.properties --- 4.8-1/bundles/org.eclipse.e4.core.services/plugin.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/plugin.properties 2018-09-06 10:51:21.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.e4.core.services/pom.xml 4.9-1/bundles/org.eclipse.e4.core.services/pom.xml --- 4.8-1/bundles/org.eclipse.e4.core.services/pom.xml 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/pom.xml 2018-09-06 10:51:21.000000000 +0000 @@ -14,11 +14,11 @@ eclipse.platform.runtime eclipse.platform.runtime - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.e4 org.eclipse.e4.core.services - 2.1.100-SNAPSHOT + 2.1.200-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/BundleTranslationProvider.java 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/BundleTranslationProvider.java --- 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/BundleTranslationProvider.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/BundleTranslationProvider.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2011, 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.e4.core.services/src/org/eclipse/e4/core/internal/services/DefaultResourceBundleProvider.java 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/DefaultResourceBundleProvider.java --- 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/DefaultResourceBundleProvider.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/DefaultResourceBundleProvider.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2014, 2016 Dirk Fauth and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Dirk Fauth - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/EclipseAdapter.java 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/EclipseAdapter.java --- 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/EclipseAdapter.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/EclipseAdapter.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 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.e4.core.services/src/org/eclipse/e4/core/internal/services/MessageFactoryServiceImpl.java 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/MessageFactoryServiceImpl.java --- 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/MessageFactoryServiceImpl.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/MessageFactoryServiceImpl.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2011, 2018 BestSolution.at and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/ResourceBundleHelper.java 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/ResourceBundleHelper.java --- 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/ResourceBundleHelper.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/ResourceBundleHelper.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2018 Dirk Fauth and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Dirk Fauth - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/ResourceBundleTranslationProvider.java 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/ResourceBundleTranslationProvider.java --- 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/ResourceBundleTranslationProvider.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/ResourceBundleTranslationProvider.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2012, 2015 Dirk Fauth and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Dirk Fauth - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/TranslationObjectSupplier.java 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/TranslationObjectSupplier.java --- 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/TranslationObjectSupplier.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/TranslationObjectSupplier.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2011, 2017 BestSolution.at and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/adapter/Adapter.java 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/adapter/Adapter.java --- 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/adapter/Adapter.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/adapter/Adapter.java 2018-09-06 10:51:21.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.e4.core.services/src/org/eclipse/e4/core/services/contributions/IContributionFactory.java 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/contributions/IContributionFactory.java --- 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/contributions/IContributionFactory.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/contributions/IContributionFactory.java 2018-09-06 10:51:21.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.e4.core.services/src/org/eclipse/e4/core/services/contributions/IContributionFactorySpi.java 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/contributions/IContributionFactorySpi.java --- 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/contributions/IContributionFactorySpi.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/contributions/IContributionFactorySpi.java 2018-09-06 10:51:21.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.e4.core.services/src/org/eclipse/e4/core/services/events/IEventBroker.java 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/events/IEventBroker.java --- 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/events/IEventBroker.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/events/IEventBroker.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 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.e4.core.services/src/org/eclipse/e4/core/services/log/ILoggerProvider.java 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/log/ILoggerProvider.java --- 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/log/ILoggerProvider.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/log/ILoggerProvider.java 2018-09-06 10:51:21.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.e4.core.services/src/org/eclipse/e4/core/services/log/Logger.java 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/log/Logger.java --- 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/log/Logger.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/log/Logger.java 2018-09-06 10:51:21.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.e4.core.services/src/org/eclipse/e4/core/services/nls/BaseMessageRegistry.java 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/BaseMessageRegistry.java --- 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/BaseMessageRegistry.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/BaseMessageRegistry.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2014, 2018 Dirk Fauth and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Dirk Fauth - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/ILocaleChangeService.java 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/ILocaleChangeService.java --- 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/ILocaleChangeService.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/ILocaleChangeService.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013 Dirk Fauth and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Dirk Fauth - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/IMessageFactoryService.java 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/IMessageFactoryService.java --- 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/IMessageFactoryService.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/IMessageFactoryService.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013 Tom Schindl and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/MessageConsumer.java 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/MessageConsumer.java --- 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/MessageConsumer.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/MessageConsumer.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2014 Dirk Fauth and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Dirk Fauth - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/MessageFunction.java 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/MessageFunction.java --- 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/MessageFunction.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/MessageFunction.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2014 Dirk Fauth and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Dirk Fauth - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/Message.java 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/Message.java --- 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/Message.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/Message.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2014 Tom Schindl and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/MessageSupplier.java 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/MessageSupplier.java --- 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/MessageSupplier.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/MessageSupplier.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2014 Dirk Fauth and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Dirk Fauth - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/Translation.java 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/Translation.java --- 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/Translation.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls/Translation.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013 Tom Schindl and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/statusreporter/StatusReporter.java 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/statusreporter/StatusReporter.java --- 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/statusreporter/StatusReporter.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/statusreporter/StatusReporter.java 2018-09-06 10:51:21.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.e4.core.services/src/org/eclipse/e4/core/services/translation/ResourceBundleProvider.java 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/translation/ResourceBundleProvider.java --- 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/translation/ResourceBundleProvider.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/translation/ResourceBundleProvider.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2014 Dirk Fauth and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Dirk Fauth - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/translation/TranslationProviderFactory.java 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/translation/TranslationProviderFactory.java --- 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/translation/TranslationProviderFactory.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/translation/TranslationProviderFactory.java 2018-09-06 10:51:21.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.e4.core.services/src/org/eclipse/e4/core/services/translation/TranslationService.java 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/translation/TranslationService.java --- 4.8-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/translation/TranslationService.java 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/translation/TranslationService.java 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2011, 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/debian/changelog 4.9-1/debian/changelog --- 4.8-1/debian/changelog 2018-11-27 11:29:00.000000000 +0000 +++ 4.9-1/debian/changelog 2018-12-03 09:50:34.000000000 +0000 @@ -1,3 +1,10 @@ +eclipse-platform-runtime (4.9-1) unstable; urgency=medium + + * New upstream release + * Depend on libeclipse-osgi-services-java (>= 3.7.0) + + -- Emmanuel Bourg Mon, 03 Dec 2018 10:50:34 +0100 + eclipse-platform-runtime (4.8-1) unstable; urgency=medium * New upstream release diff -pruN 4.8-1/debian/control 4.9-1/debian/control --- 4.8-1/debian/control 2018-11-27 11:23:32.000000000 +0000 +++ 4.9-1/debian/control 2018-12-03 09:44:24.000000000 +0000 @@ -8,7 +8,7 @@ Build-Depends: default-jdk, libatinject-jsr330-api-java, libeclipse-osgi-java, - libeclipse-osgi-services-java, + libeclipse-osgi-services-java (>= 3.7.0), libequinox-app-java, libequinox-common-java, libequinox-preferences-java, @@ -131,7 +131,7 @@ Description: Eclipse Dependency Injectio Package: libeclipse-e4-core-di-extensions-supplier-java Architecture: all -Depends: ${misc:Depends}, ${bundle-Depends}, libeclipse-osgi-services-java, libequinox-preferences-java +Depends: ${misc:Depends}, ${bundle-Depends}, libeclipse-osgi-services-java (>= 3.7.0), libequinox-preferences-java Description: Eclipse Dependency Injection Extensions Supplier Eclipse Platform defines the set of frameworks and common services that collectively make up infrastructure required to support the use of Eclipse @@ -143,7 +143,7 @@ Description: Eclipse Dependency Injectio Package: libeclipse-e4-core-services-java Architecture: all -Depends: ${misc:Depends}, ${bundle-Depends}, libatinject-jsr330-api-java, libequinox-common-java +Depends: ${misc:Depends}, ${bundle-Depends}, libatinject-jsr330-api-java, libeclipse-osgi-services-java (>= 3.7.0), libequinox-common-java Description: Eclipse Application Services Eclipse Platform defines the set of frameworks and common services that collectively make up infrastructure required to support the use of Eclipse diff -pruN 4.8-1/features/org.eclipse.core.runtime.feature/build.properties 4.9-1/features/org.eclipse.core.runtime.feature/build.properties --- 4.8-1/features/org.eclipse.core.runtime.feature/build.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/features/org.eclipse.core.runtime.feature/build.properties 2018-09-06 10:51:21.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/features/org.eclipse.core.runtime.feature/feature.properties 4.9-1/features/org.eclipse.core.runtime.feature/feature.properties --- 4.8-1/features/org.eclipse.core.runtime.feature/feature.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/features/org.eclipse.core.runtime.feature/feature.properties 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2010, 2018 EclipseSource 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: # EclipseSource - initial API and implementation @@ -26,10 +29,13 @@ description=Common OS-independent base o # "copyright" property - text of the "Feature Update Copyright" copyright=\ Copyright (c) 2010, 2018 Eclipse contributors and others.\n\ -All rights reserved. This program and the accompanying materials\n\ -are made available under the terms of the Eclipse Public License v1.0\n\ + +This program and the accompanying materials\n\ +are made available under the terms of the Eclipse Public License 2.0\n\ which accompanies this distribution, and is available at\n\ -http://www.eclipse.org/legal/epl-v10.html\n\ +https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0\n\ \n\ Contributors:\n\ EclipseSource - created feature.xml\n diff -pruN 4.8-1/features/org.eclipse.core.runtime.feature/feature.xml 4.9-1/features/org.eclipse.core.runtime.feature/feature.xml --- 4.8-1/features/org.eclipse.core.runtime.feature/feature.xml 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/features/org.eclipse.core.runtime.feature/feature.xml 2018-09-06 10:51:21.000000000 +0000 @@ -2,7 +2,7 @@ diff -pruN 4.8-1/features/org.eclipse.core.runtime.feature/pom.xml 4.9-1/features/org.eclipse.core.runtime.feature/pom.xml --- 4.8-1/features/org.eclipse.core.runtime.feature/pom.xml 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/features/org.eclipse.core.runtime.feature/pom.xml 2018-09-06 10:51:21.000000000 +0000 @@ -14,11 +14,11 @@ eclipse.platform.runtime eclipse.platform.runtime - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.core.feature org.eclipse.core.runtime.feature - 1.2.100-SNAPSHOT + 1.2.200-SNAPSHOT eclipse-feature diff -pruN 4.8-1/features/org.eclipse.core.tools-feature/build.properties 4.9-1/features/org.eclipse.core.tools-feature/build.properties --- 4.8-1/features/org.eclipse.core.tools-feature/build.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/features/org.eclipse.core.tools-feature/build.properties 2018-09-06 10:51:21.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/features/org.eclipse.core.tools-feature/cpl-v10.html 4.9-1/features/org.eclipse.core.tools-feature/cpl-v10.html --- 4.8-1/features/org.eclipse.core.tools-feature/cpl-v10.html 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/features/org.eclipse.core.tools-feature/cpl-v10.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,125 +0,0 @@ - - - -Common Public License - v 1.0 - - - - - - -

Common Public License - v 1.0 -

-

THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. -

-

1. DEFINITIONS -

"Contribution" means: - -

    a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
    -b) in the case of each subsequent Contributor:
- - -
    i) changes to the Program, and
- - -
    ii) additions to the Program;
- - -
    where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
- -

-

"Contributor" means any person or entity that distributes the Program. -

-

"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. -

-

"Program" means the Contributions distributed in accordance with this Agreement. -

-

"Recipient" means anyone who receives the Program under this Agreement, including all Contributors. -

-

2. GRANT OF RIGHTS - -

    a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
- - -
- - -
    b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
- - -
- - -
    c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
- - -
- - -
    d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
- - -
- -

3. REQUIREMENTS -

A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: - -

    a) it complies with the terms and conditions of this Agreement; and
- - -
    b) its license agreement:
- - -
    i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
- - -
    ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
- - -
    iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
- - -
    iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
- - -
- -

When the Program is made available in source code form: - -

    a) it must be made available under this Agreement; and
- - -
    b) a copy of this Agreement must be included with each copy of the Program.
- -

-

Contributors may not remove or alter any copyright notices contained within the Program. -

-

Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. -

-

4. COMMERCIAL DISTRIBUTION -

Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. -

-

For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. -

-

5. NO WARRANTY -

EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. -

-

6. DISCLAIMER OF LIABILITY -

EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -

-

7. GENERAL -

If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. -

-

If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. -

-

All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. -

-

Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. -

-

This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. -

-

- - - - \ No newline at end of file diff -pruN 4.8-1/features/org.eclipse.core.tools-feature/feature.properties 4.9-1/features/org.eclipse.core.tools-feature/feature.properties --- 4.8-1/features/org.eclipse.core.tools-feature/feature.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/features/org.eclipse.core.tools-feature/feature.properties 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2004, 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/features/org.eclipse.core.tools-feature/feature.xml 4.9-1/features/org.eclipse.core.tools-feature/feature.xml --- 4.8-1/features/org.eclipse.core.tools-feature/feature.xml 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/features/org.eclipse.core.tools-feature/feature.xml 2018-09-06 10:51:21.000000000 +0000 @@ -3,7 +3,9 @@ id="org.eclipse.core.tools" label="%featureName" version="1.4.100.qualifier" - provider-name="%providerName"> + provider-name="%providerName" + license-feature="org.eclipse.license" + license-feature-version="0.0.0"> %description diff -pruN 4.8-1/features/org.eclipse.core.tools-feature/license.html 4.9-1/features/org.eclipse.core.tools-feature/license.html --- 4.8-1/features/org.eclipse.core.tools-feature/license.html 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/features/org.eclipse.core.tools-feature/license.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,71 +0,0 @@ - - - - -Eclipse.org Software User Agreement - - - -

Eclipse.org Software User Agreement

-

14th August, 2003

- -

Usage Of Content

- -

ECLIPSE.ORG MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS - (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND - CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE - OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR - NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND - CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.

- -

Applicable Licenses

- -

Unless otherwise indicated, all Content made available by Eclipse.org is provided to you under the terms and conditions of the Common Public License Version 1.0 - ("CPL"). A copy of the CPL is provided with this Content and is also available at http://www.eclipse.org/legal/cpl-v10.html. - For purposes of the CPL, "Program" will mean the Content.

- -

Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS - modules ("Modules") and made available as downloadable archives ("Downloads").

- -

Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features"). A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins and/or Fragments associated with a Feature. Plug-ins and Fragments are located in directories - named "plugins" and Features are located in directories named "features".

- -

Features may also include other Features ("Included Features"). Files named "feature.xml" may contain a list of the names and version numbers of Included Features.

- -

The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and -Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module -including, but not limited to the following locations:

- -
    -
  • The top-level (root) directory
  • -
  • Plug-in and Fragment directories
  • -
  • Subdirectories of the directory named "src" of certain Plug-ins
  • -
  • Feature directories
  • -
- -

Note: if a Feature made available by Eclipse.org is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the -installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or -inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties". -Such Abouts, Feature Licenses and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in -that directory.

- -

THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE CPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE -OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):

- - - -

IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is provided, please -contact Eclipse.org to determine what terms and conditions govern that particular Content.

- -

Cryptography

- -

Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to - another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, - possession, or use, and re-export of encryption software, to see if this is permitted.

- - \ No newline at end of file diff -pruN 4.8-1/features/org.eclipse.core.tools-feature/pom.xml 4.9-1/features/org.eclipse.core.tools-feature/pom.xml --- 4.8-1/features/org.eclipse.core.tools-feature/pom.xml 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/features/org.eclipse.core.tools-feature/pom.xml 2018-09-06 10:51:21.000000000 +0000 @@ -14,7 +14,7 @@ eclipse.platform.runtime eclipse.platform.runtime - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.core.feature diff -pruN 4.8-1/pom.xml 4.9-1/pom.xml --- 4.8-1/pom.xml 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/pom.xml 2018-09-06 10:51:21.000000000 +0000 @@ -16,13 +16,13 @@ org.eclipse eclipse-platform-parent - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../eclipse-platform-parent eclipse.platform.runtime eclipse.platform.runtime - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT pom diff -pruN 4.8-1/tests/org.eclipse.core.contenttype.tests/about.html 4.9-1/tests/org.eclipse.core.contenttype.tests/about.html --- 4.8-1/tests/org.eclipse.core.contenttype.tests/about.html 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/tests/org.eclipse.core.contenttype.tests/about.html 2018-09-06 10:51:21.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/tests/org.eclipse.core.contenttype.tests/build.properties 4.9-1/tests/org.eclipse.core.contenttype.tests/build.properties --- 4.8-1/tests/org.eclipse.core.contenttype.tests/build.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/tests/org.eclipse.core.contenttype.tests/build.properties 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2016 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: # Mickael Istria (Red Hat Inc.) - initial API and implementation diff -pruN 4.8-1/tests/org.eclipse.core.contenttype.tests/META-INF/MANIFEST.MF 4.9-1/tests/org.eclipse.core.contenttype.tests/META-INF/MANIFEST.MF --- 4.8-1/tests/org.eclipse.core.contenttype.tests/META-INF/MANIFEST.MF 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/tests/org.eclipse.core.contenttype.tests/META-INF/MANIFEST.MF 2018-09-06 10:51:21.000000000 +0000 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.core.contenttype.tests;singleton:=true -Bundle-Version: 1.0.100.qualifier +Bundle-Version: 1.0.200.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: diff -pruN 4.8-1/tests/org.eclipse.core.contenttype.tests/plugin.properties 4.9-1/tests/org.eclipse.core.contenttype.tests/plugin.properties --- 4.8-1/tests/org.eclipse.core.contenttype.tests/plugin.properties 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/tests/org.eclipse.core.contenttype.tests/plugin.properties 2018-09-06 10:51:21.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2016 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: # Mickael Istria (Red Hat Inc.) - initial API and implementation diff -pruN 4.8-1/tests/org.eclipse.core.contenttype.tests/pom.xml 4.9-1/tests/org.eclipse.core.contenttype.tests/pom.xml --- 4.8-1/tests/org.eclipse.core.contenttype.tests/pom.xml 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/tests/org.eclipse.core.contenttype.tests/pom.xml 2018-09-06 10:51:21.000000000 +0000 @@ -15,11 +15,11 @@ eclipse.platform.runtime.tests eclipse.platform.runtime - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT org.eclipse.core org.eclipse.core.contenttype.tests - 1.0.100-SNAPSHOT + 1.0.200-SNAPSHOT eclipse-test-plugin diff -pruN 4.8-1/tests/org.eclipse.core.contenttype.tests/.settings/org.eclipse.jdt.ui.prefs 4.9-1/tests/org.eclipse.core.contenttype.tests/.settings/org.eclipse.jdt.ui.prefs --- 4.8-1/tests/org.eclipse.core.contenttype.tests/.settings/org.eclipse.jdt.ui.prefs 2018-05-30 03:38:29.000000000 +0000 +++ 4.9-1/tests/org.eclipse.core.contenttype.tests/.settings/org.eclipse.jdt.ui.prefs 2018-09-06 10:51:21.000000000 +0000 @@ -69,7 +69,7 @@ org.eclipse.jdt.ui.importorder=java;java org.eclipse.jdt.ui.keywordthis=false org.eclipse.jdt.ui.ondemandthreshold=99 org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.text.custom_code_templates=