Bug 543814 - Update copyrights and EPLv1 licenses to EPL 2.0

Signed-off-by: nickboldt <nboldt@redhat.com>
diff --git a/plugins/org.eclipse.javaee.intro/about.html b/plugins/org.eclipse.javaee.intro/about.html
index 0799bdb..3972cda 100644
--- a/plugins/org.eclipse.javaee.intro/about.html
+++ b/plugins/org.eclipse.javaee.intro/about.html
@@ -16,9 +16,9 @@
 
 <P>The Eclipse Foundation makes available all content in this plug-in 
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
+under the terms and conditions of the Eclipse Public License Version 2.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="http://www.eclipse.org/org/documents/epl-2.0/">http://www.eclipse.org/org/documents/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.javaee.intro/build.properties b/plugins/org.eclipse.javaee.intro/build.properties
index fdc527a..26abafc 100644
--- a/plugins/org.eclipse.javaee.intro/build.properties
+++ b/plugins/org.eclipse.javaee.intro/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2009, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 source.. = .
 output.. = bin/
 bin.includes = plugin.xml,\
diff --git a/plugins/org.eclipse.javaee.intro/introContent.xml b/plugins/org.eclipse.javaee.intro/introContent.xml
index e550b62..711538e 100644
--- a/plugins/org.eclipse.javaee.intro/introContent.xml
+++ b/plugins/org.eclipse.javaee.intro/introContent.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!--
+    Copyright (c) 2009, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <introContent>
     <page id="root" content="content/root.html"/>
 </introContent>
diff --git a/plugins/org.eclipse.javaee.intro/plugin.properties b/plugins/org.eclipse.javaee.intro/plugin.properties
index 173f47a..b3843ec 100644
--- a/plugins/org.eclipse.javaee.intro/plugin.properties
+++ b/plugins/org.eclipse.javaee.intro/plugin.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2009, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 ! Plugin properties
 pluginName               = Eclipse IDE for Java EE Introduction
 pluginProvider           = Eclipse.org
\ No newline at end of file
diff --git a/plugins/org.eclipse.wtp.epp.package.capabilities/about.html b/plugins/org.eclipse.wtp.epp.package.capabilities/about.html
index d2032df..7e519da 100644
--- a/plugins/org.eclipse.wtp.epp.package.capabilities/about.html
+++ b/plugins/org.eclipse.wtp.epp.package.capabilities/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-2.0/">http://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/plugins/org.eclipse.wtp.epp.package.capabilities/build.properties b/plugins/org.eclipse.wtp.epp.package.capabilities/build.properties
index c3ed7a6..4bf8e20 100644
--- a/plugins/org.eclipse.wtp.epp.package.capabilities/build.properties
+++ b/plugins/org.eclipse.wtp.epp.package.capabilities/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2009, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = META-INF/,\
                .,\
                about.html,\
diff --git a/plugins/org.eclipse.wtp.epp.package.capabilities/plugin.properties b/plugins/org.eclipse.wtp.epp.package.capabilities/plugin.properties
index 5de3883..7a7458f 100644
--- a/plugins/org.eclipse.wtp.epp.package.capabilities/plugin.properties
+++ b/plugins/org.eclipse.wtp.epp.package.capabilities/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2000, 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
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-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/plugins/org.eclipse.wtp.epp.package.capabilities/pom.xml b/plugins/org.eclipse.wtp.epp.package.capabilities/pom.xml
index f4f96d4..a9be98f 100644
--- a/plugins/org.eclipse.wtp.epp.package.capabilities/pom.xml
+++ b/plugins/org.eclipse.wtp.epp.package.capabilities/pom.xml
@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/plugins/org.eclipse.wtp.epp.package.jee.intro/about.html b/plugins/org.eclipse.wtp.epp.package.jee.intro/about.html
index 0799bdb..3972cda 100644
--- a/plugins/org.eclipse.wtp.epp.package.jee.intro/about.html
+++ b/plugins/org.eclipse.wtp.epp.package.jee.intro/about.html
@@ -16,9 +16,9 @@
 
 <P>The Eclipse Foundation makes available all content in this plug-in 
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
+under the terms and conditions of the Eclipse Public License Version 2.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="http://www.eclipse.org/org/documents/epl-2.0/">http://www.eclipse.org/org/documents/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.wtp.feature.branding.template/OSGI-INF/l10n/bundle.properties b/plugins/org.eclipse.wtp.feature.branding.template/OSGI-INF/l10n/bundle.properties
index 5000ade..945e606 100644
--- a/plugins/org.eclipse.wtp.feature.branding.template/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.eclipse.wtp.feature.branding.template/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2009, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 #Properties file for org.eclipse.wtp.branding
 Bundle-Name = [fill in same name as feature here]
 Bundle-Vendor = Eclipse Web Tools Platform
\ No newline at end of file
diff --git a/plugins/org.eclipse.wtp.feature.branding.template/about.html b/plugins/org.eclipse.wtp.feature.branding.template/about.html
index 31cec0d..ad73552 100644
--- a/plugins/org.eclipse.wtp.feature.branding.template/about.html
+++ b/plugins/org.eclipse.wtp.feature.branding.template/about.html
@@ -16,9 +16,9 @@
 
 <P>The Eclipse Foundation makes available all content in this plug-in 
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
+under the terms and conditions of the Eclipse Public License Version 2.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="http://www.eclipse.org/org/documents/epl-2.0/">http://www.eclipse.org/org/documents/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.wtp.feature.branding.template/about.properties b/plugins/org.eclipse.wtp.feature.branding.template/about.properties
index 0fe4c2d..ae977d9 100644
--- a/plugins/org.eclipse.wtp.feature.branding.template/about.properties
+++ b/plugins/org.eclipse.wtp.feature.branding.template/about.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2009 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-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/plugins/org.eclipse.wtp.feature.branding.template/build.properties b/plugins/org.eclipse.wtp.feature.branding.template/build.properties
index 9783e5a..c17da49 100644
--- a/plugins/org.eclipse.wtp.feature.branding.template/build.properties
+++ b/plugins/org.eclipse.wtp.feature.branding.template/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2009, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = META-INF/,\
                OSGI-INF/,\
                about.html,\
diff --git a/plugins/org.eclipse.wtp.feature.branding.template/pom.xml b/plugins/org.eclipse.wtp.feature.branding.template/pom.xml
index ab872e7..68c9d72 100644
--- a/plugins/org.eclipse.wtp.feature.branding.template/pom.xml
+++ b/plugins/org.eclipse.wtp.feature.branding.template/pom.xml
@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/plugins/org.eclipse.wtp.intro/about.html b/plugins/org.eclipse.wtp.intro/about.html
index 0799bdb..3972cda 100644
--- a/plugins/org.eclipse.wtp.intro/about.html
+++ b/plugins/org.eclipse.wtp.intro/about.html
@@ -16,9 +16,9 @@
 
 <P>The Eclipse Foundation makes available all content in this plug-in 
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
+under the terms and conditions of the Eclipse Public License Version 2.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="http://www.eclipse.org/org/documents/epl-2.0/">http://www.eclipse.org/org/documents/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.wtp.intro/build.properties b/plugins/org.eclipse.wtp.intro/build.properties
index d063f6c..b278fca 100644
--- a/plugins/org.eclipse.wtp.intro/build.properties
+++ b/plugins/org.eclipse.wtp.intro/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2009, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 source.. = .
 output.. = bin/
 bin.includes = META-INF/,\
diff --git a/plugins/org.eclipse.wtp.intro/css/overview.properties b/plugins/org.eclipse.wtp.intro/css/overview.properties
index 7164c5d..aa4a6a5 100644
--- a/plugins/org.eclipse.wtp.intro/css/overview.properties
+++ b/plugins/org.eclipse.wtp.intro/css/overview.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2007 IBM Corporation and others.
+# Copyright (c) 2007, 2009 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-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/plugins/org.eclipse.wtp.intro/introContent.xml b/plugins/org.eclipse.wtp.intro/introContent.xml
index 0e0a7ad..2ea5340 100644
--- a/plugins/org.eclipse.wtp.intro/introContent.xml
+++ b/plugins/org.eclipse.wtp.intro/introContent.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!--
+    Copyright (c) 2009, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <introContent>
     <page id="root" content="content/root.html"/>
     <extensionContent
diff --git a/plugins/org.eclipse.wtp.intro/newsExtension.xml b/plugins/org.eclipse.wtp.intro/newsExtension.xml
index d728346..e4418e7 100644
--- a/plugins/org.eclipse.wtp.intro/newsExtension.xml
+++ b/plugins/org.eclipse.wtp.intro/newsExtension.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+    Copyright (c) 2009, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <introContent>
    <extensionContent id="org.eclipse.wtp" name="WTP" alt-style="css/overview.properties" style="css/overview.css" path="whatsnew/@">
      <group id="content-group" style-id="content-group">
diff --git a/plugins/org.eclipse.wtp.intro/overviewExtension.xml b/plugins/org.eclipse.wtp.intro/overviewExtension.xml
index c57b309..06a3170 100644
--- a/plugins/org.eclipse.wtp.intro/overviewExtension.xml
+++ b/plugins/org.eclipse.wtp.intro/overviewExtension.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+    Copyright (c) 2009, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <introContent>
    <extensionContent id="org.eclipse.wtp" name="WTP" alt-style="css/overview.properties" style="css/overview.css" path="overview/@">
      <group id="content-group" style-id="content-group">
diff --git a/plugins/org.eclipse.wtp.intro/plugin.properties b/plugins/org.eclipse.wtp.intro/plugin.properties
index 45ae687..ae5a47a 100644
--- a/plugins/org.eclipse.wtp.intro/plugin.properties
+++ b/plugins/org.eclipse.wtp.intro/plugin.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2009, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 ! Plugin properties
 pluginName               = Eclipse WebTools Platform Project Introduction
 pluginProvider           = Eclipse.org
diff --git a/plugins/org.eclipse.wtp.intro/pom.xml b/plugins/org.eclipse.wtp.intro/pom.xml
index 67d771a..9050147 100644
--- a/plugins/org.eclipse.wtp.intro/pom.xml
+++ b/plugins/org.eclipse.wtp.intro/pom.xml
@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/plugins/org.eclipse.wtp.intro/tutorialsExtension.xml b/plugins/org.eclipse.wtp.intro/tutorialsExtension.xml
index df386be..842bb73 100644
--- a/plugins/org.eclipse.wtp.intro/tutorialsExtension.xml
+++ b/plugins/org.eclipse.wtp.intro/tutorialsExtension.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+    Copyright (c) 2009, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <introContent>
    <extensionContent id="org.eclipse.wtp" name="WTP" alt-style="css/overview.properties" style="css/overview.css" path="tutorials/@">
      <group id="content-group" style-id="content-group">
diff --git a/plugins/org.eclipse.wtp.jee.intro/about.html b/plugins/org.eclipse.wtp.jee.intro/about.html
index 0799bdb..3972cda 100644
--- a/plugins/org.eclipse.wtp.jee.intro/about.html
+++ b/plugins/org.eclipse.wtp.jee.intro/about.html
@@ -16,9 +16,9 @@
 
 <P>The Eclipse Foundation makes available all content in this plug-in 
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
+under the terms and conditions of the Eclipse Public License Version 2.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="http://www.eclipse.org/org/documents/epl-2.0/">http://www.eclipse.org/org/documents/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.wtp.jee.intro/css/overview.properties b/plugins/org.eclipse.wtp.jee.intro/css/overview.properties
index 7164c5d..85d6e00 100644
--- a/plugins/org.eclipse.wtp.jee.intro/css/overview.properties
+++ b/plugins/org.eclipse.wtp.jee.intro/css/overview.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2007 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wtp.jee/OSGI-INF/l10n/bundle.properties b/plugins/org.eclipse.wtp.jee/OSGI-INF/l10n/bundle.properties
index 4e74405..6d4f3f8 100644
--- a/plugins/org.eclipse.wtp.jee/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.eclipse.wtp.jee/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2009, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 #Properties file for org.eclipse.wtp.jee
 Bundle-Name = Java EE Developer Tools IDE
 Bundle-Vendor = Eclipse Web Tools Platform
\ No newline at end of file
diff --git a/plugins/org.eclipse.wtp.jee/about.properties b/plugins/org.eclipse.wtp.jee/about.properties
index bc58935..14b1d04 100644
--- a/plugins/org.eclipse.wtp.jee/about.properties
+++ b/plugins/org.eclipse.wtp.jee/about.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2009 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-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/plugins/org.eclipse.wtp.jee/build.properties b/plugins/org.eclipse.wtp.jee/build.properties
index e365e51..f018366 100644
--- a/plugins/org.eclipse.wtp.jee/build.properties
+++ b/plugins/org.eclipse.wtp.jee/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2009, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = META-INF/,\
                plugin_customization.ini,\
                splash.bmp,\
diff --git a/plugins/org.eclipse.wtp.jee/pom.xml b/plugins/org.eclipse.wtp.jee/pom.xml
index caf9a1e..9537e18 100644
--- a/plugins/org.eclipse.wtp.jee/pom.xml
+++ b/plugins/org.eclipse.wtp.jee/pom.xml
@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/plugins/org.eclipse.wtp.package.jee/about.properties b/plugins/org.eclipse.wtp.package.jee/about.properties
index bc58935..bf8f604 100644
--- a/plugins/org.eclipse.wtp.package.jee/about.properties
+++ b/plugins/org.eclipse.wtp.package.jee/about.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2009 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-2.0/
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wtp.releng.fixups/OSGI-INF/l10n/bundle.properties b/plugins/org.eclipse.wtp.releng.fixups/OSGI-INF/l10n/bundle.properties
index a9b8947..98765fe 100644
--- a/plugins/org.eclipse.wtp.releng.fixups/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.eclipse.wtp.releng.fixups/OSGI-INF/l10n/bundle.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2010 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
@@ -14,9 +16,9 @@
 Bundle-copyright = \
 Copyright (c) 2010 IBM Corporation and others. \
 All rights reserved. This program and the accompanying materials \
-are made available under the terms of the Eclipse Public License v1.0 \
+are made available under the terms of the Eclipse Public License 2.0 \
 which accompanies this distribution, and is available at \
-    http://www.eclipse.org/legal/epl-v10.html \
+    http://www.eclipse.org/legal/epl-2.0/ \
 \
 Contributors: \
      IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wtp.releng.fixups/about.html b/plugins/org.eclipse.wtp.releng.fixups/about.html
index bcd98a8..9e962e8 100644
--- a/plugins/org.eclipse.wtp.releng.fixups/about.html
+++ b/plugins/org.eclipse.wtp.releng.fixups/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-2.0/">http://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/plugins/org.eclipse.wtp.releng.fixups/build.properties b/plugins/org.eclipse.wtp.releng.fixups/build.properties
index 9487e6c..9de037b 100644
--- a/plugins/org.eclipse.wtp.releng.fixups/build.properties
+++ b/plugins/org.eclipse.wtp.releng.fixups/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2010 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-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/plugins/org.eclipse.wtp.releng.fixups/plugin.xml b/plugins/org.eclipse.wtp.releng.fixups/plugin.xml
index c51a9f6..f360caf 100644
--- a/plugins/org.eclipse.wtp.releng.fixups/plugin.xml
+++ b/plugins/org.eclipse.wtp.releng.fixups/plugin.xml
@@ -3,9 +3,9 @@
 <!--
     Copyright (c) 2010 IBM Corporation and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License 2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-2.0/
    
     Contributors:
         IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/CheckAndFixConsistency.java b/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/CheckAndFixConsistency.java
index 9ced5b4..8978549 100644
--- a/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/CheckAndFixConsistency.java
+++ b/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/CheckAndFixConsistency.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-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/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/MigrateLicenseSupport.java b/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/MigrateLicenseSupport.java
index daa4e88..f867158 100644
--- a/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/MigrateLicenseSupport.java
+++ b/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/MigrateLicenseSupport.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
@@ -91,7 +91,7 @@
     private static String       LICENSE_KEY                      = START_OF_LINE + KEY_WORD + ANY_NONEOL_WHITESPACE + ONE_PROPERTY_DELIMITER + ANY_END;
     private static String       LICENSE_URL                      = START_OF_LINE + URL_KEY_WORD + ANY_NONEOL_WHITESPACE + ONE_PROPERTY_DELIMITER + ANY_END;
     private static String       LICENSE_FILE_LINE                = START_OF_LINE + ANY_NONEOL_WHITESPACE + "license.html" + ANY_END;
-    private static String       EPL_FILE_LINE                    = START_OF_LINE + ANY_NONEOL_WHITESPACE + "epl-v10.html" + ANY_END;
+    private static String       EPL_FILE_LINE                    = START_OF_LINE + ANY_NONEOL_WHITESPACE + "epl-2.0.html" + ANY_END;
     private static String       FEATURE_START                    = START_OF_LINE + ANY + "<feature" + ANY_END;
     private static String       FEATURE_END                      = START_OF_LINE + ANY + ">" + ANY_END;
 
@@ -340,10 +340,10 @@
 
     private boolean removeLicenseHtml(IProject project) {
         // in addition to removing fields from features.properties, if we are re-writing it, we
-        // will blindly assume the license.html and epl-v10.html need to be removed, if they exist.
+        // will blindly assume the license.html and epl-2.0.html need to be removed, if they exist.
 
         IFile license = project.getFile("license.html");
-        IFile epl = project.getFile("epl-v10.html");
+        IFile epl = project.getFile("epl-2.0.html");
         IFile buildProperties = project.getFile("build.properties");
         IFile featureFile = project.getFile("feature.xml");
         boolean result = commonRemoveFiles(license, epl, buildProperties, featureFile);
@@ -533,7 +533,7 @@
         // with standard one.
 
         IFile license = project.getFile("license.html");
-        IFile epl = project.getFile("epl-v10.html");
+        IFile epl = project.getFile("epl-2.0.html");
         IFile buildProperties = project.getFile("build.properties");
         // for a SourceTemplateProject, there is no feature.xml file
         boolean result = commonRemoveFiles(license, epl, buildProperties, null);
diff --git a/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/epl-2.0.html b/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/epl-2.0.html
new file mode 100644
index 0000000..626fd4a
--- /dev/null
+++ b/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/epl-2.0.html
@@ -0,0 +1,300 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!-- saved from url=(0058)https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    
+    <title>Eclipse Public License - Version 2.0</title>
+    <style type="text/css">
+      body {
+        margin: 1.5em 3em;
+      }
+      h1{
+        font-size:1.5em;
+      }
+      h2{
+        font-size:1em;
+        margin-bottom:0.5em;
+        margin-top:1em;
+      }
+      p {
+        margin-top:  0.5em;
+        margin-bottom: 0.5em;
+      }
+      ul, ol{
+        list-style-type:none;
+      }
+    </style>
+  </head>
+  <body>
+    <h1>Eclipse Public License - v 2.0</h1>
+    <p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+      PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION
+      OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+    </p>
+    <h2 id="definitions">1. DEFINITIONS</h2>
+    <p>“Contribution” means:</p>
+    <ul>
+      <li>a) in the case of the initial Contributor, the initial content
+        Distributed under this Agreement, and
+      </li>
+      <li>
+        b) in the case of each subsequent Contributor:
+        <ul>
+          <li>i) changes to the Program, and</li>
+          <li>ii) additions to the Program;</li>
+        </ul>
+        where such changes and/or additions to the Program originate from
+        and are Distributed by that particular Contributor. A Contribution
+        “originates” from a Contributor if it was added to the Program by such
+        Contributor itself or anyone acting on such Contributor's behalf.
+        Contributions do not include changes or additions to the Program that
+        are not Modified Works.
+      </li>
+    </ul>
+    <p>“Contributor” means any person or entity that Distributes the Program.</p>
+    <p>“Licensed Patents” mean patent claims licensable by a Contributor which
+      are necessarily infringed by the use or sale of its Contribution alone
+      or when combined with the Program.
+    </p>
+    <p>“Program” means the Contributions Distributed in accordance with this
+      Agreement.
+    </p>
+    <p>“Recipient” means anyone who receives the Program under this Agreement
+      or any Secondary License (as applicable), including Contributors.
+    </p>
+    <p>“Derivative Works” shall mean any work, whether in Source Code or other
+      form, that is based on (or derived from) the Program and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship.
+    </p>
+    <p>“Modified Works” shall mean any work in Source Code or other form that
+      results from an addition to, deletion from, or modification of the
+      contents of the Program, including, for purposes of clarity any new file
+      in Source Code form that contains any contents of the Program. Modified
+      Works shall not include works that contain only declarations, interfaces,
+      types, classes, structures, or files of the Program solely in each case
+      in order to link to, bind by name, or subclass the Program or Modified
+      Works thereof.
+    </p>
+    <p>“Distribute” means the acts of a) distributing or b) making available
+      in any manner that enables the transfer of a copy.
+    </p>
+    <p>“Source Code” means the form of a Program preferred for making
+      modifications, including but not limited to software source code,
+      documentation source, and configuration files.
+    </p>
+    <p>“Secondary License” means either the GNU General Public License,
+      Version 2.0, or any later versions of that license, including any
+      exceptions or additional permissions as identified by the initial
+      Contributor.
+    </p>
+    <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2>
+    <ul>
+      <li>a) Subject to the terms of this Agreement, each Contributor hereby
+        grants Recipient a non-exclusive, worldwide, royalty-free copyright
+        license to reproduce, prepare Derivative Works of, publicly display,
+        publicly perform, Distribute and sublicense the Contribution of such
+        Contributor, if any, and such Derivative Works.
+      </li>
+      <li>b) Subject to the terms of this Agreement, each Contributor hereby
+        grants Recipient a non-exclusive, worldwide, royalty-free patent
+        license under Licensed Patents to make, use, sell, offer to sell,
+        import and otherwise transfer the Contribution of such Contributor,
+        if any, in Source Code or other form. This patent license shall
+        apply to the combination of the Contribution and the Program if,
+        at the time the Contribution is added by the Contributor, such
+        addition of the Contribution causes such combination to be covered
+        by the Licensed Patents. The patent license shall not apply to any
+        other combinations which include the Contribution. No hardware per
+        se is licensed hereunder.
+      </li>
+      <li>c) Recipient understands that although each Contributor grants the
+        licenses to its Contributions set forth herein, no assurances are
+        provided by any Contributor that the Program does not infringe the
+        patent or other intellectual property rights of any other entity.
+        Each Contributor disclaims any liability to Recipient for claims
+        brought by any other entity based on infringement of intellectual
+        property rights or otherwise. As a condition to exercising the rights
+        and licenses granted hereunder, each Recipient hereby assumes sole
+        responsibility to secure any other intellectual property rights needed,
+        if any. For example, if a third party patent license is required to
+        allow Recipient to Distribute the Program, it is Recipient's
+        responsibility to acquire that license before distributing the Program.
+      </li>
+      <li>d) Each Contributor represents that to its knowledge it has sufficient
+        copyright rights in its Contribution, if any, to grant the copyright
+        license set forth in this Agreement.
+      </li>
+      <li>e) Notwithstanding the terms of any Secondary License, no Contributor
+        makes additional grants to any Recipient (other than those set forth
+        in this Agreement) as a result of such Recipient's receipt of the
+        Program under the terms of a Secondary License (if permitted under
+        the terms of Section 3).
+      </li>
+    </ul>
+    <h2 id="requirements">3. REQUIREMENTS</h2>
+    <p>3.1 If a Contributor Distributes the Program in any form, then:</p>
+    <ul>
+      <li>a) the Program must also be made available as Source Code, in
+        accordance with section 3.2, and the Contributor must accompany
+        the Program with a statement that the Source Code for the Program
+        is available under this Agreement, and informs Recipients how to
+        obtain it in a reasonable manner on or through a medium customarily
+        used for software exchange; and
+      </li>
+      <li>
+        b) the Contributor may Distribute the Program under a license
+        different than this Agreement, provided that such license:
+        <ul>
+          <li>i) effectively disclaims on behalf of all other Contributors all
+            warranties and conditions, express and implied, including warranties
+            or conditions of title and non-infringement, and implied warranties
+            or conditions of merchantability and fitness for a particular purpose;
+          </li>
+          <li>ii) effectively excludes on behalf of all other Contributors all
+            liability for damages, including direct, indirect, special, incidental
+            and consequential damages, such as lost profits;
+          </li>
+          <li>iii) does not attempt to limit or alter the recipients' rights in the
+            Source Code under section 3.2; and
+          </li>
+          <li>iv) requires any subsequent distribution of the Program by any party
+            to be under a license that satisfies the requirements of this section 3.
+          </li>
+        </ul>
+      </li>
+    </ul>
+    <p>3.2 When the Program is Distributed as Source Code:</p>
+    <ul>
+      <li>a) it must be made available under this Agreement, or if the Program (i)
+        is combined with other material in a separate file or files made available
+        under a Secondary License, and (ii) the initial Contributor attached to
+        the Source Code the notice described in Exhibit A of this Agreement,
+        then the Program may be made available under the terms of such
+        Secondary Licenses, and
+      </li>
+      <li>b) a copy of this Agreement must be included with each copy of the Program.</li>
+    </ul>
+    <p>3.3 Contributors may not remove or alter any copyright, patent, trademark,
+      attribution notices, disclaimers of warranty, or limitations of liability
+      (‘notices’) contained within the Program from any copy of the Program which
+      they Distribute, provided that Contributors may add their own appropriate
+      notices.
+    </p>
+    <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2>
+    <p>Commercial distributors of software may accept certain responsibilities
+      with respect to end users, business partners and the like. While this
+      license is intended to facilitate the commercial use of the Program, the
+      Contributor who includes the Program in a commercial product offering should
+      do so in a manner which does not create potential liability for other
+      Contributors. Therefore, if a Contributor includes the Program in a
+      commercial product offering, such Contributor (“Commercial Contributor”)
+      hereby agrees to defend and indemnify every other Contributor
+      (“Indemnified Contributor”) against any losses, damages and costs
+      (collectively “Losses”) arising from claims, lawsuits and other legal actions
+      brought by a third party against the Indemnified Contributor to the extent
+      caused by the acts or omissions of such Commercial Contributor in connection
+      with its distribution of the Program in a commercial product offering.
+      The obligations in this section do not apply to any claims or Losses relating
+      to any actual or alleged intellectual property infringement. In order to
+      qualify, an Indemnified Contributor must: a) promptly notify the
+      Commercial Contributor in writing of such claim, and b) allow the Commercial
+      Contributor to control, and cooperate with the Commercial Contributor in,
+      the defense and any related settlement negotiations. The Indemnified
+      Contributor may participate in any such claim at its own expense.
+    </p>
+    <p>For example, a Contributor might include the Program
+      in a commercial product offering, Product X. That Contributor is then a
+      Commercial Contributor. If that Commercial Contributor then makes performance
+      claims, or offers warranties related to Product X, those performance claims
+      and warranties are such Commercial Contributor's responsibility alone.
+      Under this section, the Commercial Contributor would have to defend claims
+      against the other Contributors related to those performance claims and
+      warranties, and if a court requires any other Contributor to pay any damages
+      as a result, the Commercial Contributor must pay those damages.
+    </p>
+    <h2 id="warranty">5. NO WARRANTY</h2>
+    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+      BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS” BASIS, WITHOUT
+      WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+      WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+      MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is
+      solely responsible for determining the appropriateness of using and
+      distributing the Program and assumes all risks associated with its
+      exercise of rights under this Agreement, including but not limited to the
+      risks and costs of program errors, compliance with applicable laws, damage
+      to or loss of data, programs or equipment, and unavailability or
+      interruption of operations.
+    </p>
+    <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2>
+    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+      BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY
+      LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+      OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
+      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+      LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+      OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+      GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+    </p>
+    <h2 id="general">7. GENERAL</h2>
+    <p>If any provision of this Agreement is invalid or unenforceable under
+      applicable law, it shall not affect the validity or enforceability of the
+      remainder of the terms of this Agreement, and without further action by the
+      parties hereto, such provision shall be reformed to the minimum extent
+      necessary to make such provision valid and enforceable.
+    </p>
+    <p>If Recipient institutes patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+      (excluding combinations of the Program with other software or hardware)
+      infringes such Recipient's patent(s), then such Recipient's rights granted
+      under Section 2(b) shall terminate as of the date such litigation is filed.
+    </p>
+    <p>All Recipient's rights under this Agreement shall terminate if it fails to
+      comply with any of the material terms or conditions of this Agreement and
+      does not cure such failure in a reasonable period of time after becoming
+      aware of such noncompliance. If all Recipient's rights under this Agreement
+      terminate, Recipient agrees to cease use and distribution of the Program
+      as soon as reasonably practicable. However, Recipient's obligations under
+      this Agreement and any licenses granted by Recipient relating to the
+      Program shall continue and survive.
+    </p>
+    <p>Everyone is permitted to copy and distribute copies of this Agreement,
+      but in order to avoid inconsistency the Agreement is copyrighted and may
+      only be modified in the following manner. The Agreement Steward reserves
+      the right to publish new versions (including revisions) of this Agreement
+      from time to time. No one other than the Agreement Steward has the right
+      to modify this Agreement. The Eclipse Foundation is the initial Agreement
+      Steward. The Eclipse Foundation may assign the responsibility to serve as
+      the Agreement Steward to a suitable separate entity. Each new version of
+      the Agreement will be given a distinguishing version number. The Program
+      (including Contributions) may always be Distributed subject to the version
+      of the Agreement under which it was received. In addition, after a new
+      version of the Agreement is published, Contributor may elect to Distribute
+      the Program (including its Contributions) under the new version.
+    </p>
+    <p>Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+      receives no rights or licenses to the intellectual property of any
+      Contributor under this Agreement, whether expressly, by implication,
+      estoppel or otherwise. All rights in the Program not expressly granted
+      under this Agreement are reserved. Nothing in this Agreement is intended
+      to be enforceable by any entity that is not a Contributor or Recipient.
+      No third-party beneficiary rights are created under this Agreement.
+    </p>
+    <h2 id="exhibit-a">Exhibit A – Form of Secondary Licenses Notice</h2>
+    <p>“This Source Code may also be made available under the following 
+    	Secondary Licenses when the conditions for such availability set forth 
+    	in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+    	version(s), and exceptions or additional permissions here}.”
+    </p>
+    <blockquote>
+      <p>Simply including a copy of this Agreement, including this Exhibit A
+        is not sufficient to license the Source Code under Secondary Licenses.
+      </p>
+      <p>If it is not possible or desirable to put the notice in a particular file,
+        then You may include the notice in a location (such as a LICENSE file in a
+        relevant directory) where a recipient would be likely to look for
+        such a notice.
+      </p>
+      <p>You may add additional accurate notices of copyright ownership.</p>
+    </blockquote>
+  
+</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/epl-v10.html b/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/epl-v10.html
deleted file mode 100644
index fd39122..0000000
--- a/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/epl-v10.html
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Public License - Version 1.0</title>
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style>
-
-</head>
-
-<body lang="EN-US">
-
-<h2>Eclipse Public License - v 1.0</h2>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>&quot;Contribution&quot; means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>&quot;Contributor&quot; means any person or entity that distributes
-the Program.</p>
-
-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>&quot;Program&quot; means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>&quot;Recipient&quot; means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-(&quot;Commercial Contributor&quot;) hereby agrees to defend and
-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
-against any losses, damages and costs (collectively &quot;Losses&quot;)
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body>
-
-</html>
diff --git a/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/handlers/CheckLicenses.java b/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/handlers/CheckLicenses.java
index 564ba31..4acf06b 100644
--- a/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/handlers/CheckLicenses.java
+++ b/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/handlers/CheckLicenses.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-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/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/handlers/MigrateLicenses.java b/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/handlers/MigrateLicenses.java
index 439ae29..6c9d5b7 100644
--- a/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/handlers/MigrateLicenses.java
+++ b/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/handlers/MigrateLicenses.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/license.html b/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/license.html
index c3d34c3..ba8814a 100644
--- a/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/license.html
+++ b/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/license.html
@@ -21,8 +21,8 @@
 
 <h3>Applicable Licenses</h3>
 
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 2.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-2.0/">http://www.eclipse.org/legal/epl-2.0/</a>.
    For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
diff --git a/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/standard.properties b/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/standard.properties
index 427104c..38a0792 100644
--- a/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/standard.properties
+++ b/plugins/org.eclipse.wtp.releng.fixups/src/org/eclipse/wtp/releng/fixups/standard.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2010, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 license=\
 Eclipse Foundation Software User Agreement\n\
 April 9, 2014\n\
@@ -20,8 +32,8 @@
 \n\
 Unless otherwise indicated, all Content made available by the\n\
 Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+the Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-2.0/.\n\
 For purposes of the EPL, "Program" will mean the Content.\n\
 \n\
 Content includes, but is not limited to, source code, object code,\n\
diff --git a/plugins/org.eclipse.wtp.releng.tools/about.html b/plugins/org.eclipse.wtp.releng.tools/about.html
index 13a0b23..3690309 100644
--- a/plugins/org.eclipse.wtp.releng.tools/about.html
+++ b/plugins/org.eclipse.wtp.releng.tools/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-2.0/">http://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/plugins/org.eclipse.wtp.releng.tools/build.properties b/plugins/org.eclipse.wtp.releng.tools/build.properties
index db5745e..53f6cb2 100644
--- a/plugins/org.eclipse.wtp.releng.tools/build.properties
+++ b/plugins/org.eclipse.wtp.releng.tools/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2007, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = META-INF/,\
                plugin.xml,\
                plugin.properties,\
diff --git a/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/checkCharset.sh b/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/checkCharset.sh
index 7911b73..bfb0e24 100644
--- a/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/checkCharset.sh
+++ b/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/checkCharset.sh
@@ -1,4 +1,16 @@
 #!/usr/bin/env bash
+#*******************************************************************************
+# Copyright (c) 2010, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+#*******************************************************************************
 
 locale charmap
 
diff --git a/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/checkMirrors.sh b/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/checkMirrors.sh
index e40db04..3d358b7 100644
--- a/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/checkMirrors.sh
+++ b/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/checkMirrors.sh
@@ -1,12 +1,24 @@
 #!/bin/bash
+#*******************************************************************************
+# Copyright (c) 2009, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+#*******************************************************************************
 
 # Simple script to count number of mirrors available for a particular URL
 
 # Copyright (c) 2009 IBM
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 #    David Williams - initial API and implementation
diff --git a/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/dounpack.sh b/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/dounpack.sh
index d514c41..68f8139 100644
--- a/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/dounpack.sh
+++ b/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/dounpack.sh
@@ -1,3 +1,15 @@
+#*******************************************************************************
+# Copyright (c) 2009, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+#*******************************************************************************
 
 PACK_FILE=$1
 
diff --git a/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/dowork.sh b/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/dowork.sh
index d914ede..6eba9e6 100644
--- a/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/dowork.sh
+++ b/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/dowork.sh
@@ -1,3 +1,15 @@
+#*******************************************************************************
+# Copyright (c) 2009, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+#*******************************************************************************
 cd /shared/webtools
 screen -D -RR -h 5000 
 
diff --git a/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/nHandles.sh b/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/nHandles.sh
index 78a115a..3aca0bc 100644
--- a/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/nHandles.sh
+++ b/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/nHandles.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+#*******************************************************************************
+# Copyright (c) 2010, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+#*******************************************************************************
 
 echo;
 PID=$1
diff --git a/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/nThreads.sh b/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/nThreads.sh
index 3a3db5a..649b8d9 100644
--- a/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/nThreads.sh
+++ b/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/nThreads.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+#*******************************************************************************
+# Copyright (c) 2010, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+#*******************************************************************************
 
 echo;
 PID=$1
diff --git a/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/php2html.sh b/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/php2html.sh
index f82f891..70ac9cf 100644
--- a/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/php2html.sh
+++ b/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/php2html.sh
@@ -1,4 +1,16 @@
 #!/bin/bash
+#*******************************************************************************
+# Copyright (c) 2010, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+#*******************************************************************************
 
 originalFile="${1}"
 
diff --git a/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/snagxsldrop.sh b/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/snagxsldrop.sh
index b95fc8a..75c980a 100644
--- a/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/snagxsldrop.sh
+++ b/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/snagxsldrop.sh
@@ -1,3 +1,15 @@
+#*******************************************************************************
+# Copyright (c) 2009, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+#*******************************************************************************
 
 xslSite=/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R0.5/R-0.5-20080820002020/updateSite
 wtpSite=/opt/public/webtools/committers/wtp-R3.0-M/20080918035538/M-3.0.2-20080918035538
diff --git a/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/testmin.sh b/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/testmin.sh
index d4f6b46..98220c6 100644
--- a/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/testmin.sh
+++ b/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/testmin.sh
@@ -1,12 +1,24 @@
 #!/bin/bash
+#*******************************************************************************
+# Copyright (c) 2009, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+#*******************************************************************************
 
 # Simple script to count number of mirrors available for a particular URL
 
 # Copyright (c) 2009 IBM
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 #    David Williams - initial API and implementation
diff --git a/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/verify.sh b/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/verify.sh
index c6b6af7..ab57c64 100644
--- a/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/verify.sh
+++ b/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/verify.sh
@@ -1,3 +1,15 @@
+#*******************************************************************************
+# Copyright (c) 2009, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+#*******************************************************************************
 # echo 
 # echo $(basename $1
 filename="${1}"
diff --git a/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/verifydir.sh b/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/verifydir.sh
index 64e4342..7ab1ab9 100644
--- a/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/verifydir.sh
+++ b/plugins/org.eclipse.wtp.releng.tools/examplebinscripts/verifydir.sh
@@ -1,3 +1,15 @@
+#*******************************************************************************
+# Copyright (c) 2009, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+#*******************************************************************************
 
 if [ -z $1 ]
 then
diff --git a/plugins/org.eclipse.wtp.releng.tools/plugin.properties b/plugins/org.eclipse.wtp.releng.tools/plugin.properties
index 9040d0f..3e4a46e 100644
--- a/plugins/org.eclipse.wtp.releng.tools/plugin.properties
+++ b/plugins/org.eclipse.wtp.releng.tools/plugin.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2007, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 # properties file for org.eclipse.wtp.releng.tools
 Bundle-Name.0 = Releng Tools
 application.name = Add Repo Properties
\ No newline at end of file
diff --git a/plugins/org.eclipse.wtp.releng.tools/pom.xml b/plugins/org.eclipse.wtp.releng.tools/pom.xml
index 87c214f..f87258d 100644
--- a/plugins/org.eclipse.wtp.releng.tools/pom.xml
+++ b/plugins/org.eclipse.wtp.releng.tools/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-  Copyright (c) 2012, 2013 Eclipse Foundation and others.

+  Copyright (c) 2012, 2014 Eclipse Foundation and others.

   All rights reserved. This program and the accompanying materials

   are made available under the terms of the Eclipse Distribution License v1.0

   which accompanies this distribution, and is available at

@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/Activator.java b/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/Activator.java
index 2a853ea..1db8f8b 100644
--- a/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/Activator.java
+++ b/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/Activator.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2010, 2019 IBM Corporation and others.
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.wtp.releng.tools;
 
 import org.eclipse.equinox.p2.core.IProvisioningAgent;
diff --git a/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/AddRepoProperties.java b/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/AddRepoProperties.java
index ee0ac8a..d41daa2 100644
--- a/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/AddRepoProperties.java
+++ b/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/AddRepoProperties.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2010, 2019 IBM Corporation and others.
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.wtp.releng.tools;
 
 import java.net.URI;
diff --git a/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/AddRepoPropertiesApplication.java b/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/AddRepoPropertiesApplication.java
index 6b2ee4b..53d1f39 100644
--- a/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/AddRepoPropertiesApplication.java
+++ b/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/AddRepoPropertiesApplication.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2010, 2019 IBM Corporation and others.
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.wtp.releng.tools;
 
 import java.net.URISyntaxException;
diff --git a/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/CheckMemory.java b/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/CheckMemory.java
index 9041af3..a3e8512 100644
--- a/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/CheckMemory.java
+++ b/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/CheckMemory.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2010, 2019 IBM Corporation and others.
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.wtp.releng.tools;
 
 
diff --git a/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/CustomizeAccessRules.java b/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/CustomizeAccessRules.java
index 4708770..9e3e0d0 100644
--- a/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/CustomizeAccessRules.java
+++ b/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/CustomizeAccessRules.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2019 IBM Corporation and others.
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.wtp.releng.tools;
 
 import java.io.BufferedReader;
diff --git a/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/FileCounter.java b/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/FileCounter.java
index 33994b4..a885400 100644
--- a/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/FileCounter.java
+++ b/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/FileCounter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * 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
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-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/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/FullJarNameParser.java b/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/FullJarNameParser.java
index d8e0264..5c00b69 100644
--- a/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/FullJarNameParser.java
+++ b/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/FullJarNameParser.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-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/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/MapFileGenerator.java b/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/MapFileGenerator.java
index 52300f2..7a00797 100644
--- a/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/MapFileGenerator.java
+++ b/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/MapFileGenerator.java
@@ -1,8 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation and others. All rights reserved.
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
+ * terms of the Eclipse Public License 2.0 which accompanies this distribution,
+ * and is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: IBM Corporation - initial API and implementation
  * 
diff --git a/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/ResultsSummaryGenerator.java b/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/ResultsSummaryGenerator.java
index 5bc674a..63a11ce 100644
--- a/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/ResultsSummaryGenerator.java
+++ b/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/ResultsSummaryGenerator.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2019 IBM Corporation and others.
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.wtp.releng.tools;
 
 import java.io.BufferedReader;
diff --git a/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/UpdateFeatureUpdateFile.java b/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/UpdateFeatureUpdateFile.java
index 24789bc..94a40e6 100644
--- a/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/UpdateFeatureUpdateFile.java
+++ b/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/UpdateFeatureUpdateFile.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2019 IBM Corporation and others.
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.wtp.releng.tools;
 
 import java.io.File;
diff --git a/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/UpdatePackPropertiesFile.java b/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/UpdatePackPropertiesFile.java
index f3bcc67..73225ea 100644
--- a/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/UpdatePackPropertiesFile.java
+++ b/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/UpdatePackPropertiesFile.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2019 IBM Corporation and others.
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.wtp.releng.tools;
 
 import java.io.File;
diff --git a/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/WritePropertiesAsPHP.java b/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/WritePropertiesAsPHP.java
index 1c24524..931344e 100644
--- a/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/WritePropertiesAsPHP.java
+++ b/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/WritePropertiesAsPHP.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2011, 2019 IBM Corporation and others.
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.wtp.releng.tools;
 
 import java.io.File;
diff --git a/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/featuresOfInterest.properties b/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/featuresOfInterest.properties
index e0405bd..547881d 100644
--- a/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/featuresOfInterest.properties
+++ b/plugins/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/featuresOfInterest.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2007, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 org.eclipse.wst.web_ui.feature
 org.eclipse.jst.enterprise_ui.feature
 org.eclipse.jst.jsf.feature
diff --git a/plugins/org.eclipse.wtp.releng.tools/webtools-apps-getAndInstallApp.sh b/plugins/org.eclipse.wtp.releng.tools/webtools-apps-getAndInstallApp.sh
index e7c29e6..2f6a0f5 100644
--- a/plugins/org.eclipse.wtp.releng.tools/webtools-apps-getAndInstallApp.sh
+++ b/plugins/org.eclipse.wtp.releng.tools/webtools-apps-getAndInstallApp.sh
@@ -1,4 +1,16 @@
 #!/usr/bin/env bash
+#*******************************************************************************
+# Copyright (c) 2010, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+#*******************************************************************************
 
 # finds file on users path, before current directory
 # hence, non-production users can set their own values for test machines
diff --git a/plugins/org.eclipse.wtp.releng.tools/webtools-apps-runApp.sh b/plugins/org.eclipse.wtp.releng.tools/webtools-apps-runApp.sh
index f07ce2d..65bfd5e 100644
--- a/plugins/org.eclipse.wtp.releng.tools/webtools-apps-runApp.sh
+++ b/plugins/org.eclipse.wtp.releng.tools/webtools-apps-runApp.sh
@@ -1,4 +1,16 @@
 #!/usr/bin/env bash
+#*******************************************************************************
+# Copyright (c) 2010, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+#*******************************************************************************
 
 # finds file on users path, before current directory
 # hence, non-production users can set their own values for test machines
diff --git a/plugins/org.eclipse.wtp.releng.tools/webtools-apps.properties b/plugins/org.eclipse.wtp.releng.tools/webtools-apps.properties
index b343b4b..40b8dc7 100644
--- a/plugins/org.eclipse.wtp.releng.tools/webtools-apps.properties
+++ b/plugins/org.eclipse.wtp.releng.tools/webtools-apps.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2010, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 #!/usr/bin/env bash
 
 # common variables used in build.xml script