Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2018-08-28 19:07:27 +0000
committerLars Vogel2018-08-28 19:15:28 +0000
commit008da6eeabcbd6c71ba4079ca9745594b45393b2 (patch)
tree4af7ff0b2bcb8694bfbcd09fa9557ea973e38c0b
parent270e84c344137f0549670c0644402bae6e7d8b47 (diff)
downloadeclipse.pde.build-008da6eeabcbd6c71ba4079ca9745594b45393b2.tar.gz
eclipse.pde.build-008da6eeabcbd6c71ba4079ca9745594b45393b2.tar.xz
eclipse.pde.build-008da6eeabcbd6c71ba4079ca9745594b45393b2.zip
Change-Id: I2834566d99c7f48f80b1f576d3ee5d8798ac4a75 Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
-rw-r--r--org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/AssembleTests.java8
-rw-r--r--org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/FetchTests.java8
-rw-r--r--org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ProductTests.java8
-rw-r--r--org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ScriptGenerationTests.java8
-rw-r--r--org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/SourceTests.java8
-rw-r--r--org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/Utils.java9
-rw-r--r--org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ant/AntUtils.java9
-rw-r--r--org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ant/TestBrandTask.java9
-rw-r--r--org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/LicenseTests.java8
-rw-r--r--org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2TestCase.java8
-rw-r--r--org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java8
-rw-r--r--org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/PublishingTests.java8
-rw-r--r--org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/Activator.java9
-rw-r--r--org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/BuildConfiguration.java9
-rw-r--r--org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/P2TestSuite.java9
-rw-r--r--org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/PDEBuildTestSuite.java8
-rw-r--r--org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/PDETestCase.java8
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/build/Constants.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/build/IAntScript.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/build/IFetchFactory.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AbstractScriptGenerator.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AntLogAdapter.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AssembleConfigScriptGenerator.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AssembleScriptGenerator.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AssemblyInformation.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BuildActivator.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BuildApplication.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BuildScriptGenerator.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BundleHelper.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/CatchAllValue.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Config.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FeatureGenerator.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FeatureWriter.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FetchScriptGenerator.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FetchTaskFactoriesRegistry.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/IBuildPropertiesConstants.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/IPDEBuildConstants.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/IXMLConstants.java8
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Messages.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/P2ConfigScriptGenerator.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/P2InfUtils.java8
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/PDEUIStateWrapper.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ProductGenerator.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ShapeAdvisor.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/SourceFeatureInformation.java8
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/SourceFeatureWriter.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/XMLWriter.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/AntScript.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/FileSet.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/IScriptRunner.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/ITask.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/JavacTask.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/TarFileSet.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/ZipFileSet.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/AbstractBuildScriptGenerator.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/BuildDirector.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ClasspathComputer3_0.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/CompilationScriptGenerator.java8
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/DevClassPathHelper.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/FeatureBuildScriptGenerator.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/IClasspathComputer.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java8
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/SourceGenerator.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/fetch/COPYFetchTasksFactory.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/fetch/CVSFetchTaskFactory.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/fetch/GETFetchFactory.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/fetch/P2IUFetchFactory.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/DeltaPackScriptGenerator.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/ElementCollector.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/FetchFileGenerator.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/PackageConfigScriptGenerator.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/PackageScriptGenerator.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/PackagerGenerator.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/UnzipperGenerator.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/properties/PDEProperties.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/AssembledConfigAdvice.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/GeneratorApplication.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/IncrementalGenerator.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/RootFileParentAction.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/RootFileTouchpointAdvice.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeFeature.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeFeatureFactory.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeFeatureParser.java8
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeSite.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeSiteContentProvider.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeSiteFactory.java8
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/FilteringState.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/P2Utils.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PDEState.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PluginPathFinder.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/ProfileManager.java8
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/QualifierReplacer.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/ReachablePlugin.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/compatibility/FeatureReference.java9
-rw-r--r--org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/compatibility/SiteManager.java9
-rw-r--r--org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/generator/GeneratorTask.java9
-rw-r--r--org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/AbstractPublisherTask.java9
-rw-r--r--org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/BrandP2Task.java9
-rw-r--r--org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/FeaturesAndBundlesTask.java9
-rw-r--r--org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/GatherBundleTask.java9
-rw-r--r--org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/GatherFeatureTask.java9
-rw-r--r--org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/AntScriptRunner.java9
-rw-r--r--org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/BrandTask.java9
-rw-r--r--org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/BuildManifestTask.java9
-rw-r--r--org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/BuildScriptGeneratorTask.java9
-rw-r--r--org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/CompileErrorTask.java9
-rw-r--r--org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/Config.java9
-rw-r--r--org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/FeatureGeneratorTask.java9
-rw-r--r--org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/FetchFileGeneratorTask.java9
-rw-r--r--org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/FetchTask.java9
-rw-r--r--org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/GenericVersionReplacer.java9
-rw-r--r--org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/IdReplaceTask.java9
-rw-r--r--org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java9
-rw-r--r--org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGeneratorTask.java9
-rw-r--r--org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/LicenseReplaceTask.java9
-rw-r--r--org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/ManifestModifier.java9
-rw-r--r--org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/PackagerTask.java9
-rw-r--r--org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/PluginVersionReplaceTask.java9
-rw-r--r--org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/SimpleBuildLogger.java9
-rw-r--r--org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/TaskHelper.java9
-rw-r--r--org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/TaskMessages.java9
-rw-r--r--org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/UnzipperGeneratorTask.java9
123 files changed, 719 insertions, 369 deletions
diff --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/AssembleTests.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/AssembleTests.java
index 8932d08a..b2bd0ed2 100644
--- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/AssembleTests.java
+++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/AssembleTests.java
@@ -1,10 +1,12 @@
/*******************************************************************************
* Copyright (c) 2007, 2017 IBM Corporation and others.
- * All rights reserved.
+ *
* This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License 2.0 which accompanies this distribution,
* and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/FetchTests.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/FetchTests.java
index 39e75f61..68efc3af 100644
--- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/FetchTests.java
+++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/FetchTests.java
@@ -1,10 +1,12 @@
/*******************************************************************************
* Copyright (c) 2007, 2017 IBM Corporation and others.
- * All rights reserved.
+ *
* This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License 2.0 which accompanies this distribution,
* and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ProductTests.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ProductTests.java
index e8d9ebdc..d49f886a 100644
--- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ProductTests.java
+++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ProductTests.java
@@ -1,10 +1,12 @@
/*******************************************************************************
* Copyright (c) 2007, 2017 IBM Corporation and others.
- * All rights reserved.
+ *
* This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License 2.0 which accompanies this distribution,
* and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ScriptGenerationTests.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ScriptGenerationTests.java
index 6177d33a..0a1972ee 100644
--- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ScriptGenerationTests.java
+++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ScriptGenerationTests.java
@@ -1,10 +1,12 @@
/*******************************************************************************
* Copyright (c) 2007, 2017 IBM Corporation and others.
- * All rights reserved.
+ *
* This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License 2.0 which accompanies this distribution,
* and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors: Andrew Eisenberg - bug 303960 tests
*******************************************************************************/
diff --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/SourceTests.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/SourceTests.java
index 096efa74..cd190b3c 100644
--- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/SourceTests.java
+++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/SourceTests.java
@@ -1,10 +1,12 @@
/*******************************************************************************
* Copyright (c) 2007, 2017 IBM Corporation and others.
- * All rights reserved.
+ *
* This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License 2.0 which accompanies this distribution,
* and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/Utils.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/Utils.java
index a91a2e99..d5dcfd77 100644
--- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/Utils.java
+++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/Utils.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2007, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ant/AntUtils.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ant/AntUtils.java
index b831d4db..85083b38 100644
--- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ant/AntUtils.java
+++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ant/AntUtils.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ant/TestBrandTask.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ant/TestBrandTask.java
index 165562b0..4bfcadcb 100644
--- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ant/TestBrandTask.java
+++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ant/TestBrandTask.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/LicenseTests.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/LicenseTests.java
index 4bd345d7..67e519a2 100644
--- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/LicenseTests.java
+++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/LicenseTests.java
@@ -1,10 +1,12 @@
/*******************************************************************************
* Copyright (c) 2008, 2017 IBM Corporation and others.
- * All rights reserved.
+ *
* This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License 2.0 which accompanies this distribution,
* and is available at
- * 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 --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2TestCase.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2TestCase.java
index c4cbb7f4..03456c38 100644
--- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2TestCase.java
+++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2TestCase.java
@@ -1,10 +1,12 @@
/*******************************************************************************
* Copyright (c) 2008, 2017 IBM Corporation and others.
- * All rights reserved.
+ *
* This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License 2.0 which accompanies this distribution,
* and is available at
- * 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 --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java
index 4218b769..57076aba 100644
--- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java
+++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java
@@ -1,10 +1,12 @@
/*******************************************************************************
* Copyright (c) 2008, 2018 IBM Corporation and others.
- * All rights reserved.
+ *
* This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License 2.0 which accompanies this distribution,
* and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/PublishingTests.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/PublishingTests.java
index b15eff16..8254ab9c 100644
--- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/PublishingTests.java
+++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/PublishingTests.java
@@ -1,10 +1,12 @@
/*******************************************************************************
* Copyright (c) 2008, 2018 IBM Corporation and others.
- * All rights reserved.
+ *
* This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License 2.0 which accompanies this distribution,
* and is available at
- * 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 --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/Activator.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/Activator.java
index 6bb7b92b..5f43a68c 100644
--- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/Activator.java
+++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/Activator.java
@@ -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 --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/BuildConfiguration.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/BuildConfiguration.java
index 0f238836..4f75a9f0 100644
--- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/BuildConfiguration.java
+++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/BuildConfiguration.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2005, 2018 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/P2TestSuite.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/P2TestSuite.java
index 6efa89fe..cb0391fb 100644
--- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/P2TestSuite.java
+++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/P2TestSuite.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2011 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 Corporation - initial API and implementation
*******************************************************************************/
diff --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/PDEBuildTestSuite.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/PDEBuildTestSuite.java
index f28b1ba9..cac955b9 100644
--- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/PDEBuildTestSuite.java
+++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/PDEBuildTestSuite.java
@@ -1,10 +1,12 @@
/*******************************************************************************
* Copyright (c) 2007, 2017 IBM Corporation and others.
- * All rights reserved.
+ *
* This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License 2.0 which accompanies this distribution,
* and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/PDETestCase.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/PDETestCase.java
index ff7fabff..2024af1d 100644
--- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/PDETestCase.java
+++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/tests/PDETestCase.java
@@ -1,10 +1,12 @@
/*******************************************************************************
* Copyright (c) 2007, 2017 IBM Corporation and others.
- * All rights reserved.
+ *
* This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License 2.0 which accompanies this distribution,
* and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/build/Constants.java b/org.eclipse.pde.build/src/org/eclipse/pde/build/Constants.java
index 8f0c1fc7..a0cf62a2 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/build/Constants.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/build/Constants.java
@@ -1,9 +1,12 @@
/**********************************************************************
* Copyright (c) 2006, 2010 Eclipse Foundation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Gunnar Wagenknecht - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/build/IAntScript.java b/org.eclipse.pde.build/src/org/eclipse/pde/build/IAntScript.java
index 8289b582..b2efb072 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/build/IAntScript.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/build/IAntScript.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2006, 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/build/IFetchFactory.java b/org.eclipse.pde.build/src/org/eclipse/pde/build/IFetchFactory.java
index 1aa4955f..bfd38753 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/build/IFetchFactory.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/build/IFetchFactory.java
@@ -1,9 +1,12 @@
/**********************************************************************
* Copyright (c) 2004, 2013 Eclipse Foundation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Gunnar Wagenknecht - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AbstractScriptGenerator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AbstractScriptGenerator.java
index 696354b1..7f51a802 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AbstractScriptGenerator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AbstractScriptGenerator.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AntLogAdapter.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AntLogAdapter.java
index acc265e9..ba1c1cb7 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AntLogAdapter.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AntLogAdapter.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2006, 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AssembleConfigScriptGenerator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AssembleConfigScriptGenerator.java
index e7095c98..9553e9ff 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AssembleConfigScriptGenerator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AssembleConfigScriptGenerator.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AssembleScriptGenerator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AssembleScriptGenerator.java
index 18038b41..40baacdb 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AssembleScriptGenerator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AssembleScriptGenerator.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AssemblyInformation.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AssemblyInformation.java
index 3bd7b1cc..984cb1e1 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AssemblyInformation.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AssemblyInformation.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BuildActivator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BuildActivator.java
index faf8fa73..f525a002 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BuildActivator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BuildActivator.java
@@ -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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BuildApplication.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BuildApplication.java
index 7d8c5916..28c4eaef 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BuildApplication.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BuildApplication.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2007, 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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BuildScriptGenerator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BuildScriptGenerator.java
index 3c1ea76c..710bc8ed 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BuildScriptGenerator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BuildScriptGenerator.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BundleHelper.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BundleHelper.java
index 34b3163b..d969f858 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BundleHelper.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BundleHelper.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/CatchAllValue.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/CatchAllValue.java
index d8cc3360..376a2fa2 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/CatchAllValue.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/CatchAllValue.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2005, 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Config.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Config.java
index 3de85759..392549eb 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Config.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Config.java
@@ -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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FeatureGenerator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FeatureGenerator.java
index 54b2592a..cecda1fc 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FeatureGenerator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FeatureGenerator.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2006, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FeatureWriter.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FeatureWriter.java
index e567e57f..36e51a7a 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FeatureWriter.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FeatureWriter.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FetchScriptGenerator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FetchScriptGenerator.java
index 689d3cbb..1295d8e4 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FetchScriptGenerator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FetchScriptGenerator.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FetchTaskFactoriesRegistry.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FetchTaskFactoriesRegistry.java
index 8bbd209b..01662dd2 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FetchTaskFactoriesRegistry.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FetchTaskFactoriesRegistry.java
@@ -1,9 +1,12 @@
/**********************************************************************
* Copyright (c) 2004, 2017 Eclipse Foundation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Gunnar Wagenknecht - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/IBuildPropertiesConstants.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/IBuildPropertiesConstants.java
index 30321274..97e7c4d1 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/IBuildPropertiesConstants.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/IBuildPropertiesConstants.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2004, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/IPDEBuildConstants.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/IPDEBuildConstants.java
index 770106f3..3e427b2c 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/IPDEBuildConstants.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/IPDEBuildConstants.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/IXMLConstants.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/IXMLConstants.java
index 8b0efc84..16aaf274 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/IXMLConstants.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/IXMLConstants.java
@@ -1,10 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2011 IBM Corporation and others.
- * All rights reserved.
+ *
* This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License 2.0 which accompanies this distribution,
* and is available at
- * 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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Messages.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Messages.java
index cb1bf3ff..6a4272b3 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Messages.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Messages.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2005, 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/P2ConfigScriptGenerator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/P2ConfigScriptGenerator.java
index b8cf2bbb..67405b12 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/P2ConfigScriptGenerator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/P2ConfigScriptGenerator.java
@@ -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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/P2InfUtils.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/P2InfUtils.java
index 8bd279eb..14a301c3 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/P2InfUtils.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/P2InfUtils.java
@@ -1,10 +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 which accompanies this distribution,
+ * terms of the Eclipse Public License 2.0 which accompanies this distribution,
* and is available at
- * 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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/PDEUIStateWrapper.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/PDEUIStateWrapper.java
index 025373c4..06aa70e1 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/PDEUIStateWrapper.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/PDEUIStateWrapper.java
@@ -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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ProductGenerator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ProductGenerator.java
index 635f826d..71de0df3 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ProductGenerator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ProductGenerator.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2006, 2018 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ShapeAdvisor.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ShapeAdvisor.java
index 0c115281..c70a9590 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ShapeAdvisor.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ShapeAdvisor.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2008, 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/SourceFeatureInformation.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/SourceFeatureInformation.java
index 1df2d0e8..93debc8e 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/SourceFeatureInformation.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/SourceFeatureInformation.java
@@ -1,10 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2017 IBM Corporation and others.
- * All rights reserved.
+ *
* This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License 2.0 which accompanies this distribution,
* and is available at
- * 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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/SourceFeatureWriter.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/SourceFeatureWriter.java
index b3a1eba9..541c5f2a 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/SourceFeatureWriter.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/SourceFeatureWriter.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java
index 6ed0a77f..6f06a40b 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/XMLWriter.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/XMLWriter.java
index 9f7bc883..82c0000f 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/XMLWriter.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/XMLWriter.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/AntScript.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/AntScript.java
index e9e71d1d..108015d8 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/AntScript.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/AntScript.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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:
* OSGi bundles (bug 174157)
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/FileSet.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/FileSet.java
index f88cd150..a39c401a 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/FileSet.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/FileSet.java
@@ -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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/IScriptRunner.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/IScriptRunner.java
index 2264941b..cde958e8 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/IScriptRunner.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/IScriptRunner.java
@@ -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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/ITask.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/ITask.java
index a472abd6..39304a1d 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/ITask.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/ITask.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/JavacTask.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/JavacTask.java
index 1e2e8574..e64587b3 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/JavacTask.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/JavacTask.java
@@ -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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/TarFileSet.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/TarFileSet.java
index 82be276f..f43aedb8 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/TarFileSet.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/TarFileSet.java
@@ -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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/ZipFileSet.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/ZipFileSet.java
index fa4e0789..6c71903a 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/ZipFileSet.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/ZipFileSet.java
@@ -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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/AbstractBuildScriptGenerator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/AbstractBuildScriptGenerator.java
index 9f5c2604..d7d5b41b 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/AbstractBuildScriptGenerator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/AbstractBuildScriptGenerator.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/BuildDirector.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/BuildDirector.java
index 5dc2675b..2a1e5131 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/BuildDirector.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/BuildDirector.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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:
* GmbH - internationalization implementation (bug 150933)
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ClasspathComputer3_0.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ClasspathComputer3_0.java
index 5b65d76f..92b651bb 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ClasspathComputer3_0.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ClasspathComputer3_0.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/CompilationScriptGenerator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/CompilationScriptGenerator.java
index 50a0fb69..16e668c9 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/CompilationScriptGenerator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/CompilationScriptGenerator.java
@@ -1,10 +1,12 @@
/*******************************************************************************
* Copyright (c) 2008, 2018 IBM Corporation and others.
- * All rights reserved.
+ *
* This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License 2.0 which accompanies this distribution,
* and is available at
- * 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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/DevClassPathHelper.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/DevClassPathHelper.java
index 53ebb7ca..0b0bb606 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/DevClassPathHelper.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/DevClassPathHelper.java
@@ -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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/FeatureBuildScriptGenerator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/FeatureBuildScriptGenerator.java
index 3c823dbb..8e78aad6 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/FeatureBuildScriptGenerator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/FeatureBuildScriptGenerator.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/IClasspathComputer.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/IClasspathComputer.java
index 2966c9ee..c3bb1d20 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/IClasspathComputer.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/IClasspathComputer.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java
index 244b96f0..87dcaf5d 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java
@@ -1,10 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2017 IBM Corporation and others.
- * All rights reserved.
+ *
* This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License 2.0 which accompanies this distribution,
* and is available at
- * 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 Prosyst - create proper
* OSGi bundles (bug 174157)
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/SourceGenerator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/SourceGenerator.java
index f62f2c10..1f8a9429 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/SourceGenerator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/SourceGenerator.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2007, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/fetch/COPYFetchTasksFactory.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/fetch/COPYFetchTasksFactory.java
index e85bd0a7..edc29083 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/fetch/COPYFetchTasksFactory.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/fetch/COPYFetchTasksFactory.java
@@ -1,9 +1,12 @@
/**********************************************************************
* Copyright (c) 2004, 2013 Eclipse Foundation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Gunnar Wagenknecht - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/fetch/CVSFetchTaskFactory.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/fetch/CVSFetchTaskFactory.java
index 822c1acf..aeb35168 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/fetch/CVSFetchTaskFactory.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/fetch/CVSFetchTaskFactory.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/fetch/GETFetchFactory.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/fetch/GETFetchFactory.java
index 0f07f79e..d02ea4c1 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/fetch/GETFetchFactory.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/fetch/GETFetchFactory.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2007, 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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/fetch/P2IUFetchFactory.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/fetch/P2IUFetchFactory.java
index f0391511..329b806e 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/fetch/P2IUFetchFactory.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/fetch/P2IUFetchFactory.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2009, 2018 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/DeltaPackScriptGenerator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/DeltaPackScriptGenerator.java
index cba6ad88..fa664e70 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/DeltaPackScriptGenerator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/DeltaPackScriptGenerator.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2005, 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/ElementCollector.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/ElementCollector.java
index fafaa581..8f0b79a8 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/ElementCollector.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/ElementCollector.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2005, 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/FetchFileGenerator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/FetchFileGenerator.java
index 932b0b1c..bbba1b18 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/FetchFileGenerator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/FetchFileGenerator.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/PackageConfigScriptGenerator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/PackageConfigScriptGenerator.java
index 7896472e..40c3eaad 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/PackageConfigScriptGenerator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/PackageConfigScriptGenerator.java
@@ -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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/PackageScriptGenerator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/PackageScriptGenerator.java
index 51534614..610b891e 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/PackageScriptGenerator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/PackageScriptGenerator.java
@@ -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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/PackagerGenerator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/PackagerGenerator.java
index dc200c4b..059ca7be 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/PackagerGenerator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/PackagerGenerator.java
@@ -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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/UnzipperGenerator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/UnzipperGenerator.java
index 0f3eb925..6da4a6c5 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/UnzipperGenerator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/UnzipperGenerator.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/properties/PDEProperties.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/properties/PDEProperties.java
index f2cddea4..ae588615 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/properties/PDEProperties.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/properties/PDEProperties.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2006, 2018 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/AssembledConfigAdvice.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/AssembledConfigAdvice.java
index f02d2a98..52afbfb1 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/AssembledConfigAdvice.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/AssembledConfigAdvice.java
@@ -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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/GeneratorApplication.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/GeneratorApplication.java
index e5dd08c4..5b15135e 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/GeneratorApplication.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/GeneratorApplication.java
@@ -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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/IncrementalGenerator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/IncrementalGenerator.java
index 8a198231..39c81b6c 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/IncrementalGenerator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/IncrementalGenerator.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2008, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/RootFileParentAction.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/RootFileParentAction.java
index 369a1560..c1c2d472 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/RootFileParentAction.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/RootFileParentAction.java
@@ -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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/RootFileTouchpointAdvice.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/RootFileTouchpointAdvice.java
index 8f6fe6d1..21c62526 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/RootFileTouchpointAdvice.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/RootFileTouchpointAdvice.java
@@ -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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeFeature.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeFeature.java
index a8bd4b76..ecf1341f 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeFeature.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeFeature.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeFeatureFactory.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeFeatureFactory.java
index 56ee7f2d..a7520c09 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeFeatureFactory.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeFeatureFactory.java
@@ -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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeFeatureParser.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeFeatureParser.java
index 741e1030..047a4240 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeFeatureParser.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeFeatureParser.java
@@ -1,10 +1,12 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 IBM Corporation and others.
- * All rights reserved.
+ *
* This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License 2.0 which accompanies this distribution,
* and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeSite.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeSite.java
index 0ef00a99..de001fe5 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeSite.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeSite.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeSiteContentProvider.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeSiteContentProvider.java
index 527f3e75..42ba0933 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeSiteContentProvider.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeSiteContentProvider.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeSiteFactory.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeSiteFactory.java
index 16e43730..2a8f2dcb 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeSiteFactory.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeSiteFactory.java
@@ -1,10 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2017 IBM Corporation and others.
- * All rights reserved.
+ *
* This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License 2.0 which accompanies this distribution,
* and is available at
- * 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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/FilteringState.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/FilteringState.java
index 46e351e9..12850c92 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/FilteringState.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/FilteringState.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/P2Utils.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/P2Utils.java
index f7fa8a9b..667b35c3 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/P2Utils.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/P2Utils.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2008, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PDEState.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PDEState.java
index 4b62d71f..dfb3f435 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PDEState.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PDEState.java
@@ -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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PluginPathFinder.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PluginPathFinder.java
index 22bd859d..b750155c 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PluginPathFinder.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PluginPathFinder.java
@@ -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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/ProfileManager.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/ProfileManager.java
index 6abcc9ba..b37306c1 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/ProfileManager.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/ProfileManager.java
@@ -1,10 +1,12 @@
/*******************************************************************************
* Copyright (c) 2008, 2017 IBM Corporation and others.
- * All rights reserved.
+ *
* This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License 2.0 which accompanies this distribution,
* and is available at
- * 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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/QualifierReplacer.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/QualifierReplacer.java
index 313de83c..09403d40 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/QualifierReplacer.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/QualifierReplacer.java
@@ -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 --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/ReachablePlugin.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/ReachablePlugin.java
index 7b9f6356..27678a7d 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/ReachablePlugin.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/ReachablePlugin.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM - Initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/compatibility/FeatureReference.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/compatibility/FeatureReference.java
index c0dcf230..9bfab2f9 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/compatibility/FeatureReference.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/compatibility/FeatureReference.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2005, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/compatibility/SiteManager.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/compatibility/SiteManager.java
index 75174275..d35f08cb 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/compatibility/SiteManager.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/compatibility/SiteManager.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 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 Corporation - initial API and implementation
******************************************************************************/
diff --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/generator/GeneratorTask.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/generator/GeneratorTask.java
index fc9bbb9a..f22580e2 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/generator/GeneratorTask.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/generator/GeneratorTask.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2007, 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 --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/AbstractPublisherTask.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/AbstractPublisherTask.java
index 87b1fa05..5e437ed5 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/AbstractPublisherTask.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/AbstractPublisherTask.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2008, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/BrandP2Task.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/BrandP2Task.java
index bf60c05d..bac6bd59 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/BrandP2Task.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/BrandP2Task.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2009, 2017 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 Corporation - initial API and implementation
diff --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/FeaturesAndBundlesTask.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/FeaturesAndBundlesTask.java
index 23f3bc13..f4cb672d 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/FeaturesAndBundlesTask.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/FeaturesAndBundlesTask.java
@@ -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 --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/GatherBundleTask.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/GatherBundleTask.java
index 8fb97ddc..9729e760 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/GatherBundleTask.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/GatherBundleTask.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2008, 2017 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 Corporation - initial API and implementation
******************************************************************************/
diff --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/GatherFeatureTask.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/GatherFeatureTask.java
index 758431c2..2da84106 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/GatherFeatureTask.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/GatherFeatureTask.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2008, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/AntScriptRunner.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/AntScriptRunner.java
index 084bd07d..23b52cea 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/AntScriptRunner.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/AntScriptRunner.java
@@ -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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/BrandTask.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/BrandTask.java
index e670409f..93d6f268 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/BrandTask.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/BrandTask.java
@@ -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 --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/BuildManifestTask.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/BuildManifestTask.java
index ed0540cd..864e609b 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/BuildManifestTask.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/BuildManifestTask.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/BuildScriptGeneratorTask.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/BuildScriptGeneratorTask.java
index 8da60684..ff1bb119 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/BuildScriptGeneratorTask.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/BuildScriptGeneratorTask.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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 --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/CompileErrorTask.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/CompileErrorTask.java
index f9c593e7..9efa41d3 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/CompileErrorTask.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/CompileErrorTask.java
@@ -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 --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/Config.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/Config.java
index 3826f8a8..c2489ce3 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/Config.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/Config.java
@@ -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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/FeatureGeneratorTask.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/FeatureGeneratorTask.java
index a6b02a18..2de4c50c 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/FeatureGeneratorTask.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/FeatureGeneratorTask.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2006, 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM - Initial API and implementation
diff --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/FetchFileGeneratorTask.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/FetchFileGeneratorTask.java
index cadd87d1..fee914f7 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/FetchFileGeneratorTask.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/FetchFileGeneratorTask.java
@@ -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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/FetchTask.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/FetchTask.java
index 48b83391..608cf0de 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/FetchTask.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/FetchTask.java
@@ -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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/GenericVersionReplacer.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/GenericVersionReplacer.java
index 50f95b6a..660b159b 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/GenericVersionReplacer.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/GenericVersionReplacer.java
@@ -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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/IdReplaceTask.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/IdReplaceTask.java
index 47457f23..bd90788a 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/IdReplaceTask.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/IdReplaceTask.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java
index cdf068d7..93daf553 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java
@@ -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 --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGeneratorTask.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGeneratorTask.java
index dfb71e85..c6e0f7f9 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGeneratorTask.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGeneratorTask.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2005, 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/LicenseReplaceTask.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/LicenseReplaceTask.java
index 692d57a1..ea5df2d1 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/LicenseReplaceTask.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/LicenseReplaceTask.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/ManifestModifier.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/ManifestModifier.java
index d6f2e15d..1f2496d7 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/ManifestModifier.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/ManifestModifier.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/PackagerTask.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/PackagerTask.java
index ea135eb8..82d1683a 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/PackagerTask.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/PackagerTask.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2005, 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM - Initial API and implementation
diff --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/PluginVersionReplaceTask.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/PluginVersionReplaceTask.java
index 7033c4eb..97848f89 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/PluginVersionReplaceTask.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/PluginVersionReplaceTask.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 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 - Initial API and implementation
diff --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/SimpleBuildLogger.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/SimpleBuildLogger.java
index e80a84d4..627c9c0a 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/SimpleBuildLogger.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/SimpleBuildLogger.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM - Initial API and implementation
diff --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/TaskHelper.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/TaskHelper.java
index b9fbdfd7..54038299 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/TaskHelper.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/TaskHelper.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM - Initial API and implementation
diff --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/TaskMessages.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/TaskMessages.java
index 83c30649..32d3d9a1 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/TaskMessages.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/TaskMessages.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2005, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/UnzipperGeneratorTask.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/UnzipperGeneratorTask.java
index feccd269..32eebc28 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/UnzipperGeneratorTask.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/UnzipperGeneratorTask.java
@@ -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

Back to the top