Bug 543814 - Update copyrights and EPLv1 licenses to EPL 2.0

Signed-off-by: nickboldt <nboldt@redhat.com>
diff --git a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/allcomponentsSnag.sh b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/allcomponentsSnag.sh
index ae417f2..f4e8b10 100644
--- a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/allcomponentsSnag.sh
+++ b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/allcomponentsSnag.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+#*******************************************************************************
+# 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
+#*******************************************************************************
 
 . mainparams.shsource
 . copyAndRemove.sh
diff --git a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/assignGroups.sh b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/assignGroups.sh
index d503341..a4dbd36 100644
--- a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/assignGroups.sh
+++ b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/assignGroups.sh
@@ -1,4 +1,16 @@
 #!/vin/sh
+#*******************************************************************************
+# 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
+#*******************************************************************************
 
 # this file needs to be executed at top of /cvsroot/webtools directory
 # and ... as root? 
diff --git a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/backupcvsrepro.sh b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/backupcvsrepro.sh
index 6a26602..880f5f6 100755
--- a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/backupcvsrepro.sh
+++ b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/backupcvsrepro.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+#*******************************************************************************
+# 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
+#*******************************************************************************
 
 . mainparams.shsource
 
diff --git a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/cleanupAndInit.sh b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/cleanupAndInit.sh
index eb45d48..757faf9 100755
--- a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/cleanupAndInit.sh
+++ b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/cleanupAndInit.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+#*******************************************************************************
+# 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
+#*******************************************************************************
 
 
 . mainparams.shsource
diff --git a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/copyAndRemove.sh b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/copyAndRemove.sh
index d2df0cb..75bcb20 100755
--- a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/copyAndRemove.sh
+++ b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/copyAndRemove.sh
@@ -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
+#*******************************************************************************
 
 copyAndRemove ()
 {
diff --git a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/editpathnames.sh b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/editpathnames.sh
index 639ad88..463cbfb 100644
--- a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/editpathnames.sh
+++ b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/editpathnames.sh
@@ -1,4 +1,16 @@
 #!/usr/bin/sed -f

+#*******************************************************************************

+# 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

+#*******************************************************************************

 # ./editpathnames.sh someoldfile.psf > somenewfile.psf

 #

 

diff --git a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/initNew.sh b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/initNew.sh
index 92b0edb..89ea1d0 100755
--- a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/initNew.sh
+++ b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/initNew.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+#*******************************************************************************
+# 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
+#*******************************************************************************
 
 . mainparams.shsource
 
diff --git a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/moveCleanup.sh b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/moveCleanup.sh
index e16bb39..ca9ed1c 100755
--- a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/moveCleanup.sh
+++ b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/moveCleanup.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+#*******************************************************************************
+# 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
+#*******************************************************************************
 
 # this file is to run last, and just "hits" all major directories in old structure. 
 # There actually should be nothing copies here, unless it's some stray file such as 
diff --git a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/moveNewToOld.sh b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/moveNewToOld.sh
index 66094ba..f189b88 100755
--- a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/moveNewToOld.sh
+++ b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/moveNewToOld.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+#*******************************************************************************
+# 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
+#*******************************************************************************
 
 # this file is to move the "new" temporary created directories, 
 # back to the main 'webtools' cvs location. 
diff --git a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/moveall.sh b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/moveall.sh
index ec5ec32..a254f78 100755
--- a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/moveall.sh
+++ b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/moveall.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+#*******************************************************************************
+# 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
+#*******************************************************************************
 
 # These scripts pretty much have to be ran in this order, to work correctly, 
 # since some copy and remove whole sub-trees, where as others copy and remove 
diff --git a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movecommon.sh b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movecommon.sh
index fd7f97d..91f9ab3 100755
--- a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movecommon.sh
+++ b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movecommon.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+#*******************************************************************************
+# 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
+#*******************************************************************************
 
 . mainparams.shsource
 
diff --git a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/moveejb.sh b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/moveejb.sh
index 4e89a9c..d4e12f6 100755
--- a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/moveejb.sh
+++ b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/moveejb.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+#*******************************************************************************
+# 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
+#*******************************************************************************
 
 . mainparams.shsource
 . copyAndRemove.sh
diff --git a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movejee.sh b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movejee.sh
index 69d3281..5cd7090 100755
--- a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movejee.sh
+++ b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movejee.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+#*******************************************************************************
+# 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
+#*******************************************************************************
 
 . mainparams.shsource
 
diff --git a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movejsf.sh b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movejsf.sh
index 2b89bc7..0a5bbae 100755
--- a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movejsf.sh
+++ b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movejsf.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+#*******************************************************************************
+# 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
+#*******************************************************************************
 
 . mainparams.shsource
 . copyAndRemove.sh
diff --git a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movemaps.sh b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movemaps.sh
index 6e1b92c..4cc30f9 100755
--- a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movemaps.sh
+++ b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movemaps.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+#*******************************************************************************
+# 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
+#*******************************************************************************
 
 . mainparams.shsource
 . copyAndRemove.sh
diff --git a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/moverdb.sh b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/moverdb.sh
index d377b6b..5c755ae 100755
--- a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/moverdb.sh
+++ b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/moverdb.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+#*******************************************************************************
+# 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
+#*******************************************************************************
 
 . mainparams.shsource
 . copyAndRemove.sh
diff --git a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movereleng.sh b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movereleng.sh
index 9519c87..c087c6f 100755
--- a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movereleng.sh
+++ b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movereleng.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+#*******************************************************************************
+# 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
+#*******************************************************************************
 
 . mainparams.shsource
 . copyAndRemove.sh
diff --git a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/moveservertools.sh b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/moveservertools.sh
index 4500215..66c5d2b 100755
--- a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/moveservertools.sh
+++ b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/moveservertools.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+#*******************************************************************************
+# 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
+#*******************************************************************************
 
 . mainparams.shsource
 . copyAndRemove.sh
diff --git a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movesourceediting.sh b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movesourceediting.sh
index eb01df8..70f633b 100755
--- a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movesourceediting.sh
+++ b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movesourceediting.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+#*******************************************************************************
+# 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
+#*******************************************************************************
 
 . mainparams.shsource
 . copyAndRemove.sh
diff --git a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movewebservices.sh b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movewebservices.sh
index 13e21ae..bb1449e 100755
--- a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movewebservices.sh
+++ b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/movewebservices.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+#*******************************************************************************
+# 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
+#*******************************************************************************
 
 . mainparams.shsource
 . copyAndRemove.sh
diff --git a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/snagCommonDirs.sh b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/snagCommonDirs.sh
index 9a15c9d..f676e74 100755
--- a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/snagCommonDirs.sh
+++ b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/snagCommonDirs.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+#*******************************************************************************
+# 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
+#*******************************************************************************
 
 . mainparams.shsource
 . copyAndRemove.sh
diff --git a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/treeget.sh b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/treeget.sh
index 4497318..af55caa 100755
--- a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/treeget.sh
+++ b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/treeget.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+#*******************************************************************************
+# 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
+#*******************************************************************************
 
 mkdir -p /home/davidw/working
 cvs -d :ext:david_williams@dev.eclipse.org:/cvsroot/org.eclipse checkout www/webtools/development/treeout 
diff --git a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/treeout.sh b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/treeout.sh
index e0a0814..bd15a51 100755
--- a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/treeout.sh
+++ b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/treeout.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+#*******************************************************************************
+# 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
+#*******************************************************************************
 
 
 . mainparams.shsource
diff --git a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/treeput.sh b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/treeput.sh
index 1d83eb6..6c71b4b 100755
--- a/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/treeput.sh
+++ b/DEPRECATED/plugins/org.eclipse.wtp.releng.utilities/treeput.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+#*******************************************************************************
+# 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
+#*******************************************************************************
 
 cvs -d :ext:david_williams@dev.eclipse.org:/cvsroot/org.eclipse commit -R www/webtools/development/treeout
 
diff --git a/archive/working/apitools/component.xsd b/archive/working/apitools/component.xsd
index aa14352..b9966d2 100644
--- a/archive/working/apitools/component.xsd
+++ b/archive/working/apitools/component.xsd
@@ -4,9 +4,9 @@
 <!-- 
 	Copyright (c) 2005 IBM Corp.
 	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:
 	Jim des Rivieres <Jim_des_Rivieres@ca.ibm.com>
diff --git a/archive/working/apitools/components/eclipse-components/Ant/component.xml b/archive/working/apitools/components/eclipse-components/Ant/component.xml
index d9435b2..add368e 100644
--- a/archive/working/apitools/components/eclipse-components/Ant/component.xml
+++ b/archive/working/apitools/components/eclipse-components/Ant/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="Ant">
   <model:plugin fragment="false" id="org.eclipse.ant.core"/>
   <model:plugin fragment="false" id="org.eclipse.ant.ui"/>
diff --git a/archive/working/apitools/components/eclipse-components/Cheatsheets/component.xml b/archive/working/apitools/components/eclipse-components/Cheatsheets/component.xml
index 7c2aaf0..7202814 100644
--- a/archive/working/apitools/components/eclipse-components/Cheatsheets/component.xml
+++ b/archive/working/apitools/components/eclipse-components/Cheatsheets/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="Cheatsheets">
   <model:plugin fragment="false" id="org.eclipse.ui.cheatsheets"/>
   <model:package name="org.eclipse.ui.cheatsheets"/>
diff --git a/archive/working/apitools/components/eclipse-components/Compare/component.xml b/archive/working/apitools/components/eclipse-components/Compare/component.xml
index 2eba591..31a4182 100644
--- a/archive/working/apitools/components/eclipse-components/Compare/component.xml
+++ b/archive/working/apitools/components/eclipse-components/Compare/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="Compare">
   <model:plugin fragment="false" id="org.eclipse.compare"/>
   <model:package name="org.eclipse.compare"/>
diff --git a/archive/working/apitools/components/eclipse-components/Console/component.xml b/archive/working/apitools/components/eclipse-components/Console/component.xml
index 9bee618..7a0964a 100644
--- a/archive/working/apitools/components/eclipse-components/Console/component.xml
+++ b/archive/working/apitools/components/eclipse-components/Console/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="Console">
   <model:plugin fragment="false" id="org.eclipse.ui.console"/>
   <model:package name="org.eclipse.ui.console"/>
diff --git a/archive/working/apitools/components/eclipse-components/Core_Expressions/component.xml b/archive/working/apitools/components/eclipse-components/Core_Expressions/component.xml
index 19f468c..385c254 100644
--- a/archive/working/apitools/components/eclipse-components/Core_Expressions/component.xml
+++ b/archive/working/apitools/components/eclipse-components/Core_Expressions/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="Core_Expressions">
   <model:plugin fragment="false" id="org.eclipse.core.expressions"/>
   <model:package name="org.eclipse.core.expressions"/>
diff --git a/archive/working/apitools/components/eclipse-components/Core_Filebuffers/component.xml b/archive/working/apitools/components/eclipse-components/Core_Filebuffers/component.xml
index 6fe5962..3db4e2d 100644
--- a/archive/working/apitools/components/eclipse-components/Core_Filebuffers/component.xml
+++ b/archive/working/apitools/components/eclipse-components/Core_Filebuffers/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="Core_Filebuffers">
   <model:plugin fragment="false" id="org.eclipse.core.filebuffers"/>
   <model:package name="org.eclipse.core.filebuffers"/>
diff --git a/archive/working/apitools/components/eclipse-components/Core_Variables/component.xml b/archive/working/apitools/components/eclipse-components/Core_Variables/component.xml
index c7ff790..5daf615 100644
--- a/archive/working/apitools/components/eclipse-components/Core_Variables/component.xml
+++ b/archive/working/apitools/components/eclipse-components/Core_Variables/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="Core_Variables">
   <model:plugin fragment="false" id="org.eclipse.core.variables"/>
   <model:package name="org.eclipse.core.variables"/>
diff --git a/archive/working/apitools/components/eclipse-components/Help/component.xml b/archive/working/apitools/components/eclipse-components/Help/component.xml
index d73c435..a50fe1f 100644
--- a/archive/working/apitools/components/eclipse-components/Help/component.xml
+++ b/archive/working/apitools/components/eclipse-components/Help/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="Help">
   <model:plugin fragment="false" id="org.eclipse.help"/>
   <model:plugin fragment="false" id="org.eclipse.help.base"/>
diff --git a/archive/working/apitools/components/eclipse-components/JDT_Core/component.xml b/archive/working/apitools/components/eclipse-components/JDT_Core/component.xml
index 12df69c..953d2e8 100644
--- a/archive/working/apitools/components/eclipse-components/JDT_Core/component.xml
+++ b/archive/working/apitools/components/eclipse-components/JDT_Core/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="JDT_Core">
   <model:plugin fragment="false" id="org.eclipse.jdt.core"/>
   <model:package name="org.eclipse.jdt.core.dom"/>
diff --git a/archive/working/apitools/components/eclipse-components/JDT_Debug/component.xml b/archive/working/apitools/components/eclipse-components/JDT_Debug/component.xml
index 77445db..23a6e6c 100644
--- a/archive/working/apitools/components/eclipse-components/JDT_Debug/component.xml
+++ b/archive/working/apitools/components/eclipse-components/JDT_Debug/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="JDT_Debug">
   <model:plugin fragment="false" id="org.eclipse.jdt.debug"/>
   <model:plugin fragment="false" id="org.eclipse.jdt.debug.ui"/>
diff --git a/archive/working/apitools/components/eclipse-components/JDT_UI/component.xml b/archive/working/apitools/components/eclipse-components/JDT_UI/component.xml
index 7b9f531..55fe1bc 100644
--- a/archive/working/apitools/components/eclipse-components/JDT_UI/component.xml
+++ b/archive/working/apitools/components/eclipse-components/JDT_UI/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="JDT_UI">
   <model:plugin fragment="false" id="org.eclipse.jdt.ui"/>
   <model:plugin fragment="false" id="org.eclipse.jdt.junit"/>
diff --git a/archive/working/apitools/components/eclipse-components/JFace/component.xml b/archive/working/apitools/components/eclipse-components/JFace/component.xml
index 963a424..14c239d 100644
--- a/archive/working/apitools/components/eclipse-components/JFace/component.xml
+++ b/archive/working/apitools/components/eclipse-components/JFace/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="JFace">
   <model:plugin fragment="false" id="org.eclipse.jface"/>
   <model:plugin fragment="false" id="org.eclipse.jface.text"/>
diff --git a/archive/working/apitools/components/eclipse-components/LTK_Core/component.xml b/archive/working/apitools/components/eclipse-components/LTK_Core/component.xml
index 09a6976..3b96d14 100644
--- a/archive/working/apitools/components/eclipse-components/LTK_Core/component.xml
+++ b/archive/working/apitools/components/eclipse-components/LTK_Core/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="LTK_Core">
   <model:plugin fragment="false" id="org.eclipse.ltk.core.refactoring"/>
   <model:package name="org.eclipse.ltk.core.refactoring.participants"/>
diff --git a/archive/working/apitools/components/eclipse-components/LTK_UI/component.xml b/archive/working/apitools/components/eclipse-components/LTK_UI/component.xml
index 604e682..49a1cf4 100644
--- a/archive/working/apitools/components/eclipse-components/LTK_UI/component.xml
+++ b/archive/working/apitools/components/eclipse-components/LTK_UI/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="LTK_UI">
   <model:plugin fragment="false" id="org.eclipse.ltk.ui.refactoring"/>
   <model:package name="org.eclipse.ltk.ui.refactoring"/>
diff --git a/archive/working/apitools/components/eclipse-components/OSGI/component.xml b/archive/working/apitools/components/eclipse-components/OSGI/component.xml
index 1901117..1d776fa 100644
--- a/archive/working/apitools/components/eclipse-components/OSGI/component.xml
+++ b/archive/working/apitools/components/eclipse-components/OSGI/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="OSGI">
   <model:plugin fragment="false" id="org.eclipse.osgi"/>
   <model:plugin fragment="false" id="org.eclipse.osgi.util"/>
diff --git a/archive/working/apitools/components/eclipse-components/PDE/component.xml b/archive/working/apitools/components/eclipse-components/PDE/component.xml
index 542b83d..58d2805 100644
--- a/archive/working/apitools/components/eclipse-components/PDE/component.xml
+++ b/archive/working/apitools/components/eclipse-components/PDE/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="PDE">
   <model:plugin fragment="false" id="org.eclipse.pde.core"/>
   <model:plugin fragment="false" id="org.eclipse.pde.ui"/>
diff --git a/archive/working/apitools/components/eclipse-components/Platform_Debug_Core/component.xml b/archive/working/apitools/components/eclipse-components/Platform_Debug_Core/component.xml
index b87ffb7..0fc020e 100644
--- a/archive/working/apitools/components/eclipse-components/Platform_Debug_Core/component.xml
+++ b/archive/working/apitools/components/eclipse-components/Platform_Debug_Core/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="Platform_Debug_Core">
   <model:plugin fragment="false" id="org.eclipse.debug.core"/>
   <model:package name="org.eclipse.debug.core.model"/>
diff --git a/archive/working/apitools/components/eclipse-components/Platform_Debug_UI/component.xml b/archive/working/apitools/components/eclipse-components/Platform_Debug_UI/component.xml
index d77520b..aeffdc1 100644
--- a/archive/working/apitools/components/eclipse-components/Platform_Debug_UI/component.xml
+++ b/archive/working/apitools/components/eclipse-components/Platform_Debug_UI/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="Platform_Debug_UI">
   <model:plugin fragment="false" id="org.eclipse.debug.ui"/>
   <model:package name="org.eclipse.debug.ui"/>
diff --git a/archive/working/apitools/components/eclipse-components/Platform_Resources/component.xml b/archive/working/apitools/components/eclipse-components/Platform_Resources/component.xml
index 038b816..bda744c 100644
--- a/archive/working/apitools/components/eclipse-components/Platform_Resources/component.xml
+++ b/archive/working/apitools/components/eclipse-components/Platform_Resources/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <component xmlns="http://eclipse.org/wtp/releng/tools/component-model"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://eclipse.org/wtp/releng/tools/component-model ../component.xsd "
diff --git a/archive/working/apitools/components/eclipse-components/Platform_Runtime/component.xml b/archive/working/apitools/components/eclipse-components/Platform_Runtime/component.xml
index f12c15b..a5c7ce7 100644
--- a/archive/working/apitools/components/eclipse-components/Platform_Runtime/component.xml
+++ b/archive/working/apitools/components/eclipse-components/Platform_Runtime/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="Platform_Runtime">
   <model:plugin fragment="false" id="org.eclipse.core.runtime"/>
   <model:plugin fragment="false" id="org.eclipse.core.boot"/>
diff --git a/archive/working/apitools/components/eclipse-components/Platform_Text/component.xml b/archive/working/apitools/components/eclipse-components/Platform_Text/component.xml
index ec3e505..c6e41a5 100644
--- a/archive/working/apitools/components/eclipse-components/Platform_Text/component.xml
+++ b/archive/working/apitools/components/eclipse-components/Platform_Text/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="Platform_Text">
   <model:plugin fragment="false" id="org.eclipse.text"/>
   <model:plugin fragment="false" id="org.eclipse.ui.workbench.texteditor"/>
diff --git a/archive/working/apitools/components/eclipse-components/Platform_UI_IDE/component.xml b/archive/working/apitools/components/eclipse-components/Platform_UI_IDE/component.xml
index 5334599..e13f424 100644
--- a/archive/working/apitools/components/eclipse-components/Platform_UI_IDE/component.xml
+++ b/archive/working/apitools/components/eclipse-components/Platform_UI_IDE/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="Platform_UI_IDE">
   <model:plugin fragment="false" id="org.eclipse.ui.ide"/>
   <model:plugin fragment="true" id="org.eclipse.ui.workbench.compatibility"/>
diff --git a/archive/working/apitools/components/eclipse-components/Platform_UI_RCP/component.xml b/archive/working/apitools/components/eclipse-components/Platform_UI_RCP/component.xml
index f560ade..19b6f7d 100644
--- a/archive/working/apitools/components/eclipse-components/Platform_UI_RCP/component.xml
+++ b/archive/working/apitools/components/eclipse-components/Platform_UI_RCP/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="Platform_UI_RCP">
   <model:plugin fragment="false" id="org.eclipse.ui"/>
   <model:plugin fragment="false" id="org.eclipse.ui.workbench"/>
diff --git a/archive/working/apitools/components/eclipse-components/SWT/component.xml b/archive/working/apitools/components/eclipse-components/SWT/component.xml
index 713354f..eeee1d7 100644
--- a/archive/working/apitools/components/eclipse-components/SWT/component.xml
+++ b/archive/working/apitools/components/eclipse-components/SWT/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="SWT">
   <model:plugin fragment="false" id="org.eclipse.swt"/>
   <model:plugin fragment="true" id="org.eclipse.swt.win32"/>
diff --git a/archive/working/apitools/components/eclipse-components/Search/component.xml b/archive/working/apitools/components/eclipse-components/Search/component.xml
index aca6d1d..a6e6ad8 100644
--- a/archive/working/apitools/components/eclipse-components/Search/component.xml
+++ b/archive/working/apitools/components/eclipse-components/Search/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="Search">
   <model:plugin fragment="false" id="org.eclipse.search"/>
   <model:package name="org.eclipse.search.ui"/>
diff --git a/archive/working/apitools/components/eclipse-components/Team/component.xml b/archive/working/apitools/components/eclipse-components/Team/component.xml
index ce8a2e2..76dad96 100644
--- a/archive/working/apitools/components/eclipse-components/Team/component.xml
+++ b/archive/working/apitools/components/eclipse-components/Team/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="Team">
   <model:plugin fragment="false" id="org.eclipse.team.core"/>
   <model:plugin fragment="false" id="org.eclipse.team.ui"/>
diff --git a/archive/working/apitools/components/eclipse-components/UI_Forms/component.xml b/archive/working/apitools/components/eclipse-components/UI_Forms/component.xml
index 798e0bf..e1c98c9 100644
--- a/archive/working/apitools/components/eclipse-components/UI_Forms/component.xml
+++ b/archive/working/apitools/components/eclipse-components/UI_Forms/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="UI_Forms">
   <model:plugin fragment="false" id="org.eclipse.ui.forms"/>
   <model:package name="org.eclipse.ui.forms"/>
diff --git a/archive/working/apitools/components/eclipse-components/UI_Intro/component.xml b/archive/working/apitools/components/eclipse-components/UI_Intro/component.xml
index eea2f39..0e829ae 100644
--- a/archive/working/apitools/components/eclipse-components/UI_Intro/component.xml
+++ b/archive/working/apitools/components/eclipse-components/UI_Intro/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="UI_Intro">
   <model:plugin fragment="false" id="org.eclipse.ui.intro"/>
   <model:package name="org.eclipse.ui.intro.config"/>
diff --git a/archive/working/apitools/components/eclipse-components/Update/component.xml b/archive/working/apitools/components/eclipse-components/Update/component.xml
index 117f009..b5616e7 100644
--- a/archive/working/apitools/components/eclipse-components/Update/component.xml
+++ b/archive/working/apitools/components/eclipse-components/Update/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="Update">
   <model:plugin fragment="false" id="org.eclipse.update.core"/>
   <model:plugin fragment="true" id="org.eclipse.update.core.win32"/>
diff --git a/archive/working/apitools/components/emf-components/emf/component.xml b/archive/working/apitools/components/emf-components/emf/component.xml
index 6fe1199..4d57eb9 100644
--- a/archive/working/apitools/components/emf-components/emf/component.xml
+++ b/archive/working/apitools/components/emf-components/emf/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="emf">
   <model:plugin fragment="false" id="org.eclipse.emf.codegen.ecore.ui"/>
   <model:plugin fragment="false" id="org.eclipse.emf.codegen.ecore"/>
diff --git a/archive/working/apitools/components/emf-components/sdo/component.xml b/archive/working/apitools/components/emf-components/sdo/component.xml
index d436a87..4fcbb93 100644
--- a/archive/working/apitools/components/emf-components/sdo/component.xml
+++ b/archive/working/apitools/components/emf-components/sdo/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="sdo">
   <model:plugin fragment="false" id="org.eclipse.emf.commonj.sdo"/>
   <model:plugin fragment="false" id="org.eclipse.emf.ecore.sdo.edit"/>
diff --git a/archive/working/apitools/components/emf-components/xsd/component.xml b/archive/working/apitools/components/emf-components/xsd/component.xml
index a748c61..52c7cc5 100644
--- a/archive/working/apitools/components/emf-components/xsd/component.xml
+++ b/archive/working/apitools/components/emf-components/xsd/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="xsd">
   <model:plugin fragment="false" id="org.eclipse.xsd.edit"/>
   <model:plugin fragment="false" id="org.eclipse.xsd.editor"/>
diff --git a/archive/working/apitools/components/gef-components/gef/component.xml b/archive/working/apitools/components/gef-components/gef/component.xml
index 7887195..30bb9d8 100644
--- a/archive/working/apitools/components/gef-components/gef/component.xml
+++ b/archive/working/apitools/components/gef-components/gef/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="gef">
   <model:plugin fragment="false" id="org.eclipse.gef"/>
   <model:plugin fragment="false" id="org.eclipse.draw2d"/>
diff --git a/archive/working/apitools/components/ve-components/jem/component.xml b/archive/working/apitools/components/ve-components/jem/component.xml
index 118bb90..3e2a2b9 100644
--- a/archive/working/apitools/components/ve-components/jem/component.xml
+++ b/archive/working/apitools/components/ve-components/jem/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="jem">
   <model:plugin fragment="false" id="com.ibm.etools.emf.event"/>
   <model:plugin fragment="false" id="com.ibm.wtp.common.util"/>
diff --git a/archive/working/apitools/components/wtp-components/jst.common/component.xml b/archive/working/apitools/components/wtp-components/jst.common/component.xml
index c625754..11ef453 100644
--- a/archive/working/apitools/components/wtp-components/jst.common/component.xml
+++ b/archive/working/apitools/components/wtp-components/jst.common/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="jst.common">
   <model:plugin fragment="false" id="org.eclipse.jst.common.annotations.controller"/>
   <model:plugin fragment="false" id="org.eclipse.jst.common.annotations.core"/>
diff --git a/archive/working/apitools/components/wtp-components/jst.ejb/component.xml b/archive/working/apitools/components/wtp-components/jst.ejb/component.xml
index fef5105..19a1a05 100644
--- a/archive/working/apitools/components/wtp-components/jst.ejb/component.xml
+++ b/archive/working/apitools/components/wtp-components/jst.ejb/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="jst.ejb">
   <model:plugin fragment="false" id="org.eclipse.jst.ejb.ui"/>
   <model:package name="org.eclipse.jst.ejb.ui"/>
diff --git a/archive/working/apitools/components/wtp-components/jst.j2ee/component.xml b/archive/working/apitools/components/wtp-components/jst.j2ee/component.xml
index 75fcb1b..6b81087 100644
--- a/archive/working/apitools/components/wtp-components/jst.j2ee/component.xml
+++ b/archive/working/apitools/components/wtp-components/jst.j2ee/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="jst.j2ee">
   <model:plugin fragment="false" id="org.eclipse.jst.j2ee"/>
   <model:plugin fragment="false" id="org.eclipse.jst.j2ee.core"/>
diff --git a/archive/working/apitools/components/wtp-components/jst.jsp/component.xml b/archive/working/apitools/components/wtp-components/jst.jsp/component.xml
index bfdf08b..2886027 100644
--- a/archive/working/apitools/components/wtp-components/jst.jsp/component.xml
+++ b/archive/working/apitools/components/wtp-components/jst.jsp/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="jst.jsp">
   <model:plugin fragment="false" id="org.eclipse.jst.jsp.core"/>
   <model:plugin fragment="false" id="org.eclipse.jst.jsp.ui"/>
diff --git a/archive/working/apitools/components/wtp-components/jst.server/component.xml b/archive/working/apitools/components/wtp-components/jst.server/component.xml
index 4c46a07..40e6dd9 100644
--- a/archive/working/apitools/components/wtp-components/jst.server/component.xml
+++ b/archive/working/apitools/components/wtp-components/jst.server/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="jst.server">
   <model:plugin fragment="false" id="org.eclipse.jst.server.core"/>
   <model:plugin fragment="false" id="org.eclipse.jst.server.generic.core"/>
diff --git a/archive/working/apitools/components/wtp-components/jst.servlet/component.xml b/archive/working/apitools/components/wtp-components/jst.servlet/component.xml
index 7d86b2e..ba01ca9 100644
--- a/archive/working/apitools/components/wtp-components/jst.servlet/component.xml
+++ b/archive/working/apitools/components/wtp-components/jst.servlet/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="jst.servlet">
   <model:plugin fragment="false" id="org.eclipse.jst.servlet.ui"/>
   <model:package name="org.eclipse.jst.servlet.ui"/>
diff --git a/archive/working/apitools/components/wtp-components/jst.ws/component.xml b/archive/working/apitools/components/wtp-components/jst.ws/component.xml
index a66a74d..66a0dc8 100644
--- a/archive/working/apitools/components/wtp-components/jst.ws/component.xml
+++ b/archive/working/apitools/components/wtp-components/jst.ws/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="jst.ws">
   <model:component-depends unrestricted="true"/>
 </model:component>
diff --git a/archive/working/apitools/components/wtp-components/wst.command/component.xml b/archive/working/apitools/components/wtp-components/wst.command/component.xml
index ee02f54..f949e43 100644
--- a/archive/working/apitools/components/wtp-components/wst.command/component.xml
+++ b/archive/working/apitools/components/wtp-components/wst.command/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="wst.command">
   <model:plugin fragment="false" id="org.eclipse.wst.command.env"/>
   <model:plugin fragment="false" id="org.eclipse.wst.command.env.core"/>
diff --git a/archive/working/apitools/components/wtp-components/wst.common/component.xml b/archive/working/apitools/components/wtp-components/wst.common/component.xml
index 9c4a64f..10d27ba 100644
--- a/archive/working/apitools/components/wtp-components/wst.common/component.xml
+++ b/archive/working/apitools/components/wtp-components/wst.common/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="wst.common">
   <model:plugin fragment="false" id="org.eclipse.wst.common.contentmodel"/>
   <model:plugin fragment="false" id="org.eclipse.wst.common.emf"/>
diff --git a/archive/working/apitools/components/wtp-components/wst.css/component.xml b/archive/working/apitools/components/wtp-components/wst.css/component.xml
index 0990e4a..ae70f9f 100644
--- a/archive/working/apitools/components/wtp-components/wst.css/component.xml
+++ b/archive/working/apitools/components/wtp-components/wst.css/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="wst.css">
   <model:plugin fragment="false" id="org.eclipse.wst.css.core"/>
   <model:plugin fragment="false" id="org.eclipse.wst.css.ui"/>
diff --git a/archive/working/apitools/components/wtp-components/wst.dtd/component.xml b/archive/working/apitools/components/wtp-components/wst.dtd/component.xml
index c71d89b..7d0e4ae 100644
--- a/archive/working/apitools/components/wtp-components/wst.dtd/component.xml
+++ b/archive/working/apitools/components/wtp-components/wst.dtd/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="wst.dtd">
   <model:plugin fragment="false" id="org.eclipse.wst.dtd"/>
   <model:plugin fragment="false" id="org.eclipse.wst.dtd.contentmodel"/>
diff --git a/archive/working/apitools/components/wtp-components/wst.html/component.xml b/archive/working/apitools/components/wtp-components/wst.html/component.xml
index 4a9c42f..d5642b3 100644
--- a/archive/working/apitools/components/wtp-components/wst.html/component.xml
+++ b/archive/working/apitools/components/wtp-components/wst.html/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="wst.html">
   <model:plugin fragment="false" id="org.eclipse.wst.html.core"/>
   <model:plugin fragment="false" id="org.eclipse.wst.html.ui"/>
diff --git a/archive/working/apitools/components/wtp-components/wst.internet/component.xml b/archive/working/apitools/components/wtp-components/wst.internet/component.xml
index 303834c..ef8090b 100644
--- a/archive/working/apitools/components/wtp-components/wst.internet/component.xml
+++ b/archive/working/apitools/components/wtp-components/wst.internet/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="wst.internet">
   <model:plugin fragment="false" id="org.eclipse.wst.internet.monitor.core"/>
   <model:plugin fragment="false" id="org.eclipse.wst.internet.monitor.ui"/>
diff --git a/archive/working/apitools/components/wtp-components/wst.javascript/component.xml b/archive/working/apitools/components/wtp-components/wst.javascript/component.xml
index cd99e2f..bd43dd7 100644
--- a/archive/working/apitools/components/wtp-components/wst.javascript/component.xml
+++ b/archive/working/apitools/components/wtp-components/wst.javascript/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="wst.javascript">
   <model:plugin fragment="false" id="org.eclipse.wst.javascript.common.ui"/>
   <model:plugin fragment="false" id="org.eclipse.wst.javascript.core"/>
diff --git a/archive/working/apitools/components/wtp-components/wst.rdb/component.xml b/archive/working/apitools/components/wtp-components/wst.rdb/component.xml
index d027a0f..7fcb4b5 100644
--- a/archive/working/apitools/components/wtp-components/wst.rdb/component.xml
+++ b/archive/working/apitools/components/wtp-components/wst.rdb/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="wst.rdb">
   <model:plugin fragment="false" id="org.eclipse.wst.rdb.connection.ui"/>
   <model:plugin fragment="false" id="org.eclipse.wst.rdb.core"/>
diff --git a/archive/working/apitools/components/wtp-components/wst.server/component.xml b/archive/working/apitools/components/wtp-components/wst.server/component.xml
index c3a004f..c6a6128 100644
--- a/archive/working/apitools/components/wtp-components/wst.server/component.xml
+++ b/archive/working/apitools/components/wtp-components/wst.server/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="wst.server">
   <model:plugin fragment="false" id="org.eclipse.wst.server.core"/>
   <model:plugin fragment="false" id="org.eclipse.wst.server.ui"/>
diff --git a/archive/working/apitools/components/wtp-components/wst.sse/component.xml b/archive/working/apitools/components/wtp-components/wst.sse/component.xml
index 5f8c9ef..b7063db 100644
--- a/archive/working/apitools/components/wtp-components/wst.sse/component.xml
+++ b/archive/working/apitools/components/wtp-components/wst.sse/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="wst.sse">
   <model:plugin fragment="false" id="org.eclipse.wst.sse.core"/>
   <model:plugin fragment="false" id="org.eclipse.wst.sse.snippets"/>
diff --git a/archive/working/apitools/components/wtp-components/wst.validation/component.xml b/archive/working/apitools/components/wtp-components/wst.validation/component.xml
index 3d0341e..2d5b45b 100644
--- a/archive/working/apitools/components/wtp-components/wst.validation/component.xml
+++ b/archive/working/apitools/components/wtp-components/wst.validation/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="wst.validation">
   <model:plugin fragment="false" id="org.eclipse.wst.validation"/>
   <model:plugin fragment="false" id="org.eclipse.wst.validation.ui"/>
diff --git a/archive/working/apitools/components/wtp-components/wst.web/component.xml b/archive/working/apitools/components/wtp-components/wst.web/component.xml
index a9475b9..700cb18 100644
--- a/archive/working/apitools/components/wtp-components/wst.web/component.xml
+++ b/archive/working/apitools/components/wtp-components/wst.web/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="wst.web">
   <model:plugin fragment="false" id="org.eclipse.wst.web"/>
   <model:plugin fragment="false" id="org.eclipse.wst.web.ui"/>
diff --git a/archive/working/apitools/components/wtp-components/wst.ws/component.xml b/archive/working/apitools/components/wtp-components/wst.ws/component.xml
index 048a344..3912a34 100644
--- a/archive/working/apitools/components/wtp-components/wst.ws/component.xml
+++ b/archive/working/apitools/components/wtp-components/wst.ws/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="wst.ws">
   <model:component-depends unrestricted="true"/>
 </model:component>
diff --git a/archive/working/apitools/components/wtp-components/wst.wsdl/component.xml b/archive/working/apitools/components/wtp-components/wst.wsdl/component.xml
index fdb3030..89f9d7e 100644
--- a/archive/working/apitools/components/wtp-components/wst.wsdl/component.xml
+++ b/archive/working/apitools/components/wtp-components/wst.wsdl/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="wst.wsdl">
   <model:component-depends unrestricted="true"/>
 </model:component>
diff --git a/archive/working/apitools/components/wtp-components/wst.wsi/component.xml b/archive/working/apitools/components/wtp-components/wst.wsi/component.xml
index 4daa20f..26115ab 100644
--- a/archive/working/apitools/components/wtp-components/wst.wsi/component.xml
+++ b/archive/working/apitools/components/wtp-components/wst.wsi/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="wst.wsi">
   <model:component-depends unrestricted="true"/>
 </model:component>
diff --git a/archive/working/apitools/components/wtp-components/wst.xml/component.xml b/archive/working/apitools/components/wtp-components/wst.xml/component.xml
index df613c2..731093e 100644
--- a/archive/working/apitools/components/wtp-components/wst.xml/component.xml
+++ b/archive/working/apitools/components/wtp-components/wst.xml/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="wst.xml">
   <model:plugin fragment="false" id="org.eclipse.wst.xml.core"/>
   <model:plugin fragment="false" id="org.eclipse.wst.xml.ui"/>
diff --git a/archive/working/apitools/components/wtp-components/wst.xsd/component.xml b/archive/working/apitools/components/wtp-components/wst.xsd/component.xml
index 50e2fbe..268723b 100644
--- a/archive/working/apitools/components/wtp-components/wst.xsd/component.xml
+++ b/archive/working/apitools/components/wtp-components/wst.xsd/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <model:component xmlns:model="http://eclipse.org/wtp/releng/tools/component-model" name="wst.xsd">
   <model:plugin fragment="false" id="org.eclipse.wst.xsd.contentmodel"/>
   <model:plugin fragment="false" id="org.eclipse.wst.xsd.ui"/>
diff --git a/archive/working/apitools/org.eclipse.component.api.core/build.properties b/archive/working/apitools/org.eclipse.component.api.core/build.properties
index 79fbd82..95353d3 100644
--- a/archive/working/apitools/org.eclipse.component.api.core/build.properties
+++ b/archive/working/apitools/org.eclipse.component.api.core/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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
+###############################################################################
 <!--
 /**
  * <copyright>
diff --git a/archive/working/apitools/org.eclipse.component.api.core/plugin.properties b/archive/working/apitools/org.eclipse.component.api.core/plugin.properties
index 1a1eea4..830d440 100644
--- a/archive/working/apitools/org.eclipse.component.api.core/plugin.properties
+++ b/archive/working/apitools/org.eclipse.component.api.core/plugin.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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
+###############################################################################
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/ApiFactory.java b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/ApiFactory.java
index f5a5380..a00d9c7 100644
--- a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/ApiFactory.java
+++ b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/ApiFactory.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/ApiPackage.java b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/ApiPackage.java
index 80690b3..fcdcc75 100644
--- a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/ApiPackage.java
+++ b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/ApiPackage.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/ApiTypes.java b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/ApiTypes.java
index fd412ea..8b96058 100644
--- a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/ApiTypes.java
+++ b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/ApiTypes.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/ClassApi.java b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/ClassApi.java
index b830d93..98f42bc 100644
--- a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/ClassApi.java
+++ b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/ClassApi.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/ComponentApiType.java b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/ComponentApiType.java
index 304eb34..43656bf 100644
--- a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/ComponentApiType.java
+++ b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/ComponentApiType.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/DocumentRoot.java b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/DocumentRoot.java
index 5c7ba4f..b21d226 100644
--- a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/DocumentRoot.java
+++ b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/DocumentRoot.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/FieldApi.java b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/FieldApi.java
index fd10e17..6078fa5 100644
--- a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/FieldApi.java
+++ b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/FieldApi.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/MethodApi.java b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/MethodApi.java
index 98dbdf9..0e432af 100644
--- a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/MethodApi.java
+++ b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/MethodApi.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/Package.java b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/Package.java
index 23cd3b8..0901f8b 100644
--- a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/Package.java
+++ b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/Package.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/Visibility.java b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/Visibility.java
index 17287e3..367dc87 100644
--- a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/Visibility.java
+++ b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/Visibility.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/ApiFactoryImpl.java b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/ApiFactoryImpl.java
index e7f724b..ddab4f6 100644
--- a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/ApiFactoryImpl.java
+++ b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/ApiFactoryImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/ApiPackageImpl.java b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/ApiPackageImpl.java
index 44f56ed..59edde4 100644
--- a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/ApiPackageImpl.java
+++ b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/ApiPackageImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/ApiTypesImpl.java b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/ApiTypesImpl.java
index 05e298d..f7fad5f 100644
--- a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/ApiTypesImpl.java
+++ b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/ApiTypesImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/ClassApiImpl.java b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/ClassApiImpl.java
index 6cde68b..a023c58 100644
--- a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/ClassApiImpl.java
+++ b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/ClassApiImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/ComponentApiTypeImpl.java b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/ComponentApiTypeImpl.java
index 35a65a5..d6bf9c4 100644
--- a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/ComponentApiTypeImpl.java
+++ b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/ComponentApiTypeImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/DocumentRootImpl.java b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/DocumentRootImpl.java
index 6c4629a..9dd0f7c 100644
--- a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/DocumentRootImpl.java
+++ b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/DocumentRootImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/FieldApiImpl.java b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/FieldApiImpl.java
index 7e74eba..6df93da 100644
--- a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/FieldApiImpl.java
+++ b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/FieldApiImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/MethodApiImpl.java b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/MethodApiImpl.java
index 3eff60c..1bf9734 100644
--- a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/MethodApiImpl.java
+++ b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/MethodApiImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/PackageImpl.java b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/PackageImpl.java
index 18ff4f4..b84d84e 100644
--- a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/PackageImpl.java
+++ b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/impl/PackageImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/util/ApiAdapterFactory.java b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/util/ApiAdapterFactory.java
index 097444d..ed385cc 100644
--- a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/util/ApiAdapterFactory.java
+++ b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/util/ApiAdapterFactory.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/util/ApiResourceFactoryImpl.java b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/util/ApiResourceFactoryImpl.java
index af7273f..72b3497 100644
--- a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/util/ApiResourceFactoryImpl.java
+++ b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/util/ApiResourceFactoryImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/util/ApiResourceImpl.java b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/util/ApiResourceImpl.java
index 8120a26..187545b 100644
--- a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/util/ApiResourceImpl.java
+++ b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/util/ApiResourceImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/util/ApiSwitch.java b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/util/ApiSwitch.java
index d078e42..17100fd 100644
--- a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/util/ApiSwitch.java
+++ b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/util/ApiSwitch.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/util/ApiValidator.java b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/util/ApiValidator.java
index 6dab0bc..7dc2522 100644
--- a/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/util/ApiValidator.java
+++ b/archive/working/apitools/org.eclipse.component.api.core/src/org/eclipse/component/api/util/ApiValidator.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.core/build.properties b/archive/working/apitools/org.eclipse.component.core/build.properties
index 24c16a7..88aa514 100644
--- a/archive/working/apitools/org.eclipse.component.core/build.properties
+++ b/archive/working/apitools/org.eclipse.component.core/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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
+###############################################################################
 <!--
 /**
  * <copyright>
diff --git a/archive/working/apitools/org.eclipse.component.core/plugin.properties b/archive/working/apitools/org.eclipse.component.core/plugin.properties
index 5bdb04e..0a0edcb 100644
--- a/archive/working/apitools/org.eclipse.component.core/plugin.properties
+++ b/archive/working/apitools/org.eclipse.component.core/plugin.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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
+###############################################################################
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/ComponentDependsType.java b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/ComponentDependsType.java
index ebb01fb..63150d0 100644
--- a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/ComponentDependsType.java
+++ b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/ComponentDependsType.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/ComponentFactory.java b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/ComponentFactory.java
index eb7d5e9..ff2f7b0 100644
--- a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/ComponentFactory.java
+++ b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/ComponentFactory.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/ComponentPackage.java b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/ComponentPackage.java
index 00c4ebf..c4c25b0 100644
--- a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/ComponentPackage.java
+++ b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/ComponentPackage.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/ComponentRefType.java b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/ComponentRefType.java
index eae9bbe..161f9c1 100644
--- a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/ComponentRefType.java
+++ b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/ComponentRefType.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/ComponentType.java b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/ComponentType.java
index 9c3d388..06a2bad 100644
--- a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/ComponentType.java
+++ b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/ComponentType.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/DocumentRoot.java b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/DocumentRoot.java
index 28d68bf..b83afaa 100644
--- a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/DocumentRoot.java
+++ b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/DocumentRoot.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/PackageType.java b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/PackageType.java
index 62e13e5..52ae529 100644
--- a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/PackageType.java
+++ b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/PackageType.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/PluginType.java b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/PluginType.java
index 93a2d5a..d113ae7 100644
--- a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/PluginType.java
+++ b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/PluginType.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/TypeType.java b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/TypeType.java
index 7c54e76..4a28f68 100644
--- a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/TypeType.java
+++ b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/TypeType.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/ComponentDependsTypeImpl.java b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/ComponentDependsTypeImpl.java
index 7178204..eb7195e 100644
--- a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/ComponentDependsTypeImpl.java
+++ b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/ComponentDependsTypeImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/ComponentFactoryImpl.java b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/ComponentFactoryImpl.java
index 461033d..9e5da19 100644
--- a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/ComponentFactoryImpl.java
+++ b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/ComponentFactoryImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/ComponentPackageImpl.java b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/ComponentPackageImpl.java
index eb255cf..c5dbea1 100644
--- a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/ComponentPackageImpl.java
+++ b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/ComponentPackageImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/ComponentRefTypeImpl.java b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/ComponentRefTypeImpl.java
index dcb52d7..f6d1394 100644
--- a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/ComponentRefTypeImpl.java
+++ b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/ComponentRefTypeImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/ComponentTypeImpl.java b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/ComponentTypeImpl.java
index 8e56390..3eef6d5 100644
--- a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/ComponentTypeImpl.java
+++ b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/ComponentTypeImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/DocumentRootImpl.java b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/DocumentRootImpl.java
index 1e110ef..2d0efd4 100644
--- a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/DocumentRootImpl.java
+++ b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/DocumentRootImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/PackageTypeImpl.java b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/PackageTypeImpl.java
index d3c00ef..abaa0e0 100644
--- a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/PackageTypeImpl.java
+++ b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/PackageTypeImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/PluginTypeImpl.java b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/PluginTypeImpl.java
index efe15d2..742d8eb 100644
--- a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/PluginTypeImpl.java
+++ b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/PluginTypeImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/TypeTypeImpl.java b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/TypeTypeImpl.java
index 2e6fb7f..f473e89 100644
--- a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/TypeTypeImpl.java
+++ b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/impl/TypeTypeImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/util/ComponentAdapterFactory.java b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/util/ComponentAdapterFactory.java
index 2f507f1..ce756f6 100644
--- a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/util/ComponentAdapterFactory.java
+++ b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/util/ComponentAdapterFactory.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/util/ComponentResourceFactoryImpl.java b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/util/ComponentResourceFactoryImpl.java
index effb61c..dce5c7d 100644
--- a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/util/ComponentResourceFactoryImpl.java
+++ b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/util/ComponentResourceFactoryImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/util/ComponentResourceImpl.java b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/util/ComponentResourceImpl.java
index 0a5514d..5014cc0 100644
--- a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/util/ComponentResourceImpl.java
+++ b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/util/ComponentResourceImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/util/ComponentSwitch.java b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/util/ComponentSwitch.java
index f81de96..f35a8b2 100644
--- a/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/util/ComponentSwitch.java
+++ b/archive/working/apitools/org.eclipse.component.core/src/org/eclipse/component/util/ComponentSwitch.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.core/xsd/component.xsd b/archive/working/apitools/org.eclipse.component.core/xsd/component.xsd
index b437399..7bede1f 100644
--- a/archive/working/apitools/org.eclipse.component.core/xsd/component.xsd
+++ b/archive/working/apitools/org.eclipse.component.core/xsd/component.xsd
@@ -4,9 +4,9 @@
 <!-- 
 	Copyright (c) 2005 IBM Corp.
 	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:
 	Jim des Rivieres <Jim_des_Rivieres@ca.ibm.com>
diff --git a/archive/working/apitools/org.eclipse.component.use.core/build.properties b/archive/working/apitools/org.eclipse.component.use.core/build.properties
index a1fb148..0702ab6 100644
--- a/archive/working/apitools/org.eclipse.component.use.core/build.properties
+++ b/archive/working/apitools/org.eclipse.component.use.core/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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
+###############################################################################
 <!--
 /**
  * <copyright>
diff --git a/archive/working/apitools/org.eclipse.component.use.core/plugin.properties b/archive/working/apitools/org.eclipse.component.use.core/plugin.properties
index 3406362..987ac0f 100644
--- a/archive/working/apitools/org.eclipse.component.use.core/plugin.properties
+++ b/archive/working/apitools/org.eclipse.component.use.core/plugin.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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
+###############################################################################
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/ComponentUseType.java b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/ComponentUseType.java
index 3f3b239..9f18e53 100644
--- a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/ComponentUseType.java
+++ b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/ComponentUseType.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/DocumentRoot.java b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/DocumentRoot.java
index c5aa0ea..3d24e96 100644
--- a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/DocumentRoot.java
+++ b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/DocumentRoot.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/SourceClass.java b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/SourceClass.java
index 2c32c7a..d01cb54 100644
--- a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/SourceClass.java
+++ b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/SourceClass.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/UseFactory.java b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/UseFactory.java
index 1ff7a85..b1d165d 100644
--- a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/UseFactory.java
+++ b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/UseFactory.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/UsePackage.java b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/UsePackage.java
index be4c6d1..058fbc2 100644
--- a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/UsePackage.java
+++ b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/UsePackage.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/impl/ComponentUseTypeImpl.java b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/impl/ComponentUseTypeImpl.java
index 8c5d4b0..78e2eda 100644
--- a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/impl/ComponentUseTypeImpl.java
+++ b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/impl/ComponentUseTypeImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/impl/DocumentRootImpl.java b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/impl/DocumentRootImpl.java
index 685e559..729d775 100644
--- a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/impl/DocumentRootImpl.java
+++ b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/impl/DocumentRootImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/impl/SourceClassImpl.java b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/impl/SourceClassImpl.java
index bc5997f..51bf467 100644
--- a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/impl/SourceClassImpl.java
+++ b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/impl/SourceClassImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/impl/UseFactoryImpl.java b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/impl/UseFactoryImpl.java
index d838094..7c56eea 100644
--- a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/impl/UseFactoryImpl.java
+++ b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/impl/UseFactoryImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/impl/UsePackageImpl.java b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/impl/UsePackageImpl.java
index d90d704..4532a7d 100644
--- a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/impl/UsePackageImpl.java
+++ b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/impl/UsePackageImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/util/UseAdapterFactory.java b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/util/UseAdapterFactory.java
index 9102aba..7fa77bf 100644
--- a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/util/UseAdapterFactory.java
+++ b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/util/UseAdapterFactory.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/util/UseResourceFactoryImpl.java b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/util/UseResourceFactoryImpl.java
index b548b4b..7e5e7ee 100644
--- a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/util/UseResourceFactoryImpl.java
+++ b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/util/UseResourceFactoryImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/util/UseResourceImpl.java b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/util/UseResourceImpl.java
index 940ea8a..8b19e76 100644
--- a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/util/UseResourceImpl.java
+++ b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/util/UseResourceImpl.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/util/UseSwitch.java b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/util/UseSwitch.java
index c3cb79e..1dc041a 100644
--- a/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/util/UseSwitch.java
+++ b/archive/working/apitools/org.eclipse.component.use.core/src/org/eclipse/component/use/util/UseSwitch.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 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
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/APIViolationEmitter.java b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/APIViolationEmitter.java
index 8cf454e..70f990d 100644
--- a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/APIViolationEmitter.java
+++ b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/APIViolationEmitter.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/Component.java b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/Component.java
index 6857aed..325e14f 100644
--- a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/Component.java
+++ b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/Component.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/ComponentAPIEmitter.java b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/ComponentAPIEmitter.java
index a146707..9fb355f 100644
--- a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/ComponentAPIEmitter.java
+++ b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/ComponentAPIEmitter.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/ComponentEmitter.java b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/ComponentEmitter.java
index cb8de2f..586f7f0 100644
--- a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/ComponentEmitter.java
+++ b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/ComponentEmitter.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/TestMain.java b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/TestMain.java
index 1513cc0..43b11ca 100644
--- a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/TestMain.java
+++ b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/TestMain.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/ConfigurationFileLocator.java b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/ConfigurationFileLocator.java
index 607b0d1..c8ebbe3 100644
--- a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/ConfigurationFileLocator.java
+++ b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/ConfigurationFileLocator.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/ConfigurationFileParser.java b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/ConfigurationFileParser.java
index 9602c58..4765d79 100644
--- a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/ConfigurationFileParser.java
+++ b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/ConfigurationFileParser.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/EclipseInternalRules.java b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/EclipseInternalRules.java
index ac94efa..1f89cf8 100644
--- a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/EclipseInternalRules.java
+++ b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/EclipseInternalRules.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/Fragment.java b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/Fragment.java
index 827985e..7bc5c9d 100644
--- a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/Fragment.java
+++ b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/Fragment.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/IInternalRules.java b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/IInternalRules.java
index 3311037..ef60027 100644
--- a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/IInternalRules.java
+++ b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/IInternalRules.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/InternalReferenceComparator.java b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/InternalReferenceComparator.java
index 5a573b0..395d54b 100644
--- a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/InternalReferenceComparator.java
+++ b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/InternalReferenceComparator.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/InternalTypeReference.java b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/InternalTypeReference.java
index acef1fd..b60180e 100644
--- a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/InternalTypeReference.java
+++ b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/InternalTypeReference.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/Library.java b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/Library.java
index e0830a5..9b2f3c0 100644
--- a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/Library.java
+++ b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/Library.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/Main.java b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/Main.java
index 0917092..9f0c8bf 100644
--- a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/Main.java
+++ b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/Main.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/Plugin.java b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/Plugin.java
index 0331260..78d5b9c 100644
--- a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/Plugin.java
+++ b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/Plugin.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/ReportGenerator.java b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/ReportGenerator.java
index 1ab174b..4d12731 100644
--- a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/ReportGenerator.java
+++ b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/ReportGenerator.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/Type.java b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/Type.java
index bedaf83..0b1b19c 100644
--- a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/Type.java
+++ b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/internalreference/Type.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/AbstractZipLocation.java b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/AbstractZipLocation.java
index 2d19518..875d3e3 100644
--- a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/AbstractZipLocation.java
+++ b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/AbstractZipLocation.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/FileLocation.java b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/FileLocation.java
index 1c478a3..7983826 100644
--- a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/FileLocation.java
+++ b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/FileLocation.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/IFileLocation.java b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/IFileLocation.java
index defbdf6..9dae434 100644
--- a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/IFileLocation.java
+++ b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/IFileLocation.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/ILocation.java b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/ILocation.java
index c4f647d..c3efb46 100644
--- a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/ILocation.java
+++ b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/ILocation.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/ILocationChildrenIterator.java b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/ILocationChildrenIterator.java
index f7d0d66..6bde2ef 100644
--- a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/ILocationChildrenIterator.java
+++ b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/ILocationChildrenIterator.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/ILocationVisitor.java b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/ILocationVisitor.java
index 4fe23f3..0dc601b 100644
--- a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/ILocationVisitor.java
+++ b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/ILocationVisitor.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/Location.java b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/Location.java
index e5f5844..6203523 100644
--- a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/Location.java
+++ b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/Location.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/ZipEntryLocation.java b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/ZipEntryLocation.java
index 7c1aae5..c5aedd1 100644
--- a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/ZipEntryLocation.java
+++ b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/ZipEntryLocation.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/ZipLocation.java b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/ZipLocation.java
index 49e11dd..e989f1f 100644
--- a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/ZipLocation.java
+++ b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/location/ZipLocation.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/util/CommandLineParser.java b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/util/CommandLineParser.java
index f39e7c3..04b15e3 100644
--- a/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/util/CommandLineParser.java
+++ b/archive/working/apitools/org.eclipse.component/src/org/eclipse/component/util/CommandLineParser.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.core.resources/component.xml b/archive/working/apitools/org.eclipse.core.resources/component.xml
index 5dff0d0..e63a3ba 100644
--- a/archive/working/apitools/org.eclipse.core.resources/component.xml
+++ b/archive/working/apitools/org.eclipse.core.resources/component.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <component xmlns="http://eclipse.org/component"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://eclipse.org/component ../component.xsd "
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/build.properties b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/build.properties
index 99cf29d..e52f042 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/build.properties
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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 = plugin.xml,\
                componentcore.jar,\
                data/,\
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/data/eclipse.properties b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/data/eclipse.properties
index e151875..69a071d 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/data/eclipse.properties
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/data/eclipse.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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
+###############################################################################
 Ant=org.eclipse.ant.core \
  org.eclipse.ant.ui
 
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/data/emf.properties b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/data/emf.properties
index 882b584..0573a68 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/data/emf.properties
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/data/emf.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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
+###############################################################################
 emf=org.eclipse.emf.codegen.ecore.ui \
  org.eclipse.emf.codegen.ecore \
  org.eclipse.emf.codegen.ui \
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/data/gef.properties b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/data/gef.properties
index 557a324..e373714 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/data/gef.properties
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/data/gef.properties
@@ -1,2 +1,14 @@
+###############################################################################
+# Copyright (c) 2005, 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
+###############################################################################
 gef=org.eclipse.gef \
  org.eclipse.draw2d
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/data/ve.properties b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/data/ve.properties
index d7a64ab..dec7848 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/data/ve.properties
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/data/ve.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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
+###############################################################################
 jem=com.ibm.etools.emf.event \
  com.ibm.wtp.common.util \
  com.ibm.wtp.emf.workbench \
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/data/wtp.properties b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/data/wtp.properties
index cd34228..b469b7d 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/data/wtp.properties
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/data/wtp.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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
+###############################################################################
 wst.command=org.eclipse.wst.command.env \
  org.eclipse.wst.command.env.core \
  org.eclipse.wst.command.env.ui
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IClazz.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IClazz.java
index dee53cf..3ab1b1d 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IClazz.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IClazz.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IClazzVisitor.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IClazzVisitor.java
index fc9b292..5e83d2f 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IClazzVisitor.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IClazzVisitor.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IFileLocation.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IFileLocation.java
index 307f165..b91300f 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IFileLocation.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IFileLocation.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IFragmentXML.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IFragmentXML.java
index 3b65670..a9b9906 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IFragmentXML.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IFragmentXML.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/ILibrary.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/ILibrary.java
index 84e3b6f..ba14af1 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/ILibrary.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/ILibrary.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/ILocation.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/ILocation.java
index deb860a..b12aba8 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/ILocation.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/ILocation.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/ILocationChildrenIterator.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/ILocationChildrenIterator.java
index 72baf1b..1d335ca 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/ILocationChildrenIterator.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/ILocationChildrenIterator.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/ILocationVisitor.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/ILocationVisitor.java
index 66d6ec0..79a47a7 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/ILocationVisitor.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/ILocationVisitor.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IPluginXML.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IPluginXML.java
index d41f30a..3f64f44 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IPluginXML.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IPluginXML.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/TestMain.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/TestMain.java
index dc70a8d..92f3f11 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/TestMain.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/TestMain.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/APIs.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/APIs.java
index 7534700..9dce9608 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/APIs.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/APIs.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ClassAPI.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ClassAPI.java
index d167ddf..a3b2ebd 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ClassAPI.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ClassAPI.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentAPI.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentAPI.java
index d580649..1e58edf 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentAPI.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentAPI.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentAPIEmitter.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentAPIEmitter.java
index 0876106..bde39d2 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentAPIEmitter.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentAPIEmitter.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/FieldAPI.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/FieldAPI.java
index 97d6043..ef6151a 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/FieldAPI.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/FieldAPI.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/MethodAPI.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/MethodAPI.java
index d1c955b..a19a141 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/MethodAPI.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/MethodAPI.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/PackageAPI.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/PackageAPI.java
index 87df98a..85bad4d 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/PackageAPI.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/PackageAPI.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/compatibility/APICompatibility.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/compatibility/APICompatibility.java
index 86723b3..9430905 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/compatibility/APICompatibility.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/compatibility/APICompatibility.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/compatibility/APICompatibilityEmitter.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/compatibility/APICompatibilityEmitter.java
index 5dc5412..733bfd2 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/compatibility/APICompatibilityEmitter.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/compatibility/APICompatibilityEmitter.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/compatibility/APICompatibilitySummary.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/compatibility/APICompatibilitySummary.java
index 83093ec..cc9a733 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/compatibility/APICompatibilitySummary.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/compatibility/APICompatibilitySummary.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/testcoverage/APITestCoverageEmitter.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/testcoverage/APITestCoverageEmitter.java
index 59da219..0a08e6f 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/testcoverage/APITestCoverageEmitter.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/testcoverage/APITestCoverageEmitter.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/testcoverage/APITestCoverageSummary.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/testcoverage/APITestCoverageSummary.java
index 45d1656..5f5a462 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/testcoverage/APITestCoverageSummary.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/testcoverage/APITestCoverageSummary.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/testcoverage/MethodAPITestCoverage.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/testcoverage/MethodAPITestCoverage.java
index d575f0c..6664460 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/testcoverage/MethodAPITestCoverage.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/testcoverage/MethodAPITestCoverage.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/testcoverage/Testcase.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/testcoverage/Testcase.java
index f598f39..b28cc11 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/testcoverage/Testcase.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/testcoverage/Testcase.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/AbstractEmitter.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/AbstractEmitter.java
index 41f62de..411f523 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/AbstractEmitter.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/AbstractEmitter.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/AbstractZipLocation.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/AbstractZipLocation.java
index 87506a6..af7dd63 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/AbstractZipLocation.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/AbstractZipLocation.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Bundle.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Bundle.java
index 903f255..b7bf7ee 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Bundle.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Bundle.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Clazz.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Clazz.java
index 68fe745..c0c39bd 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Clazz.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Clazz.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ComponentEntry.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ComponentEntry.java
index b4eeef0..871b16f 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ComponentEntry.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ComponentEntry.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ComponentSummary.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ComponentSummary.java
index bd561ef..cb0a128 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ComponentSummary.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ComponentSummary.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/FieldRef.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/FieldRef.java
index 62aba7e..931de53 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/FieldRef.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/FieldRef.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/FileLocation.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/FileLocation.java
index d283b14..5a173c7 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/FileLocation.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/FileLocation.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/FragmentXML.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/FragmentXML.java
index 96f34f4..1ed39fb 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/FragmentXML.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/FragmentXML.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/InternalByteCodeVisitor.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/InternalByteCodeVisitor.java
index a93270d..146d1b3 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/InternalByteCodeVisitor.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/InternalByteCodeVisitor.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Library.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Library.java
index 1bb4f2c..f02bfe3 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Library.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Library.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Location.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Location.java
index 520dd9b..6e17b05 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Location.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Location.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/MethodRef.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/MethodRef.java
index 2a0b698..05ccc08 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/MethodRef.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/MethodRef.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/PluginClasspath.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/PluginClasspath.java
index b7db76b..1b61447 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/PluginClasspath.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/PluginClasspath.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/PluginXML.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/PluginXML.java
index 2f234d3..c3108d3 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/PluginXML.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/PluginXML.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/URLLocation.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/URLLocation.java
index 918087e..944b56a 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/URLLocation.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/URLLocation.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ZipEntryLocation.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ZipEntryLocation.java
index 0951440..db2e361 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ZipEntryLocation.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ZipEntryLocation.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ZipLocation.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ZipLocation.java
index dd45218..5bf4fde 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ZipLocation.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ZipLocation.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentDepends.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentDepends.java
index 081a227..e71e89f 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentDepends.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentDepends.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentEmitter.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentEmitter.java
index accaf02..d684e45 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentEmitter.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentEmitter.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentRef.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentRef.java
index a90ad0c..6165cea 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentRef.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentRef.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentXML.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentXML.java
index 3b97594..170c387b 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentXML.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentXML.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/Package.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/Package.java
index 41aebc7..e4be1d6 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/Package.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/Package.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/Plugin.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/Plugin.java
index 17d9610..6d6d9c1 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/Plugin.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/Plugin.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/Type.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/Type.java
index 273e7cc..c5eb9ad 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/Type.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/Type.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/ClassUse.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/ClassUse.java
index 1b27cc5..9337c01 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/ClassUse.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/ClassUse.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/ComponentUse.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/ComponentUse.java
index c668719..26f3c60 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/ComponentUse.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/ComponentUse.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/ComponentUseEmitter.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/ComponentUseEmitter.java
index 6e16fba..e650206 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/ComponentUseEmitter.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/ComponentUseEmitter.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/FieldUse.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/FieldUse.java
index 07540c2..0c8caf7 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/FieldUse.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/FieldUse.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/MethodUse.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/MethodUse.java
index a542e69..f05cdef 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/MethodUse.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/MethodUse.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/Source.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/Source.java
index cc94b38..ed9cafe 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/Source.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/Source.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/util/CommandOptionParser.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/util/CommandOptionParser.java
index 83d84fc..068fdf1 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/util/CommandOptionParser.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/util/CommandOptionParser.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/violation/ComponentViolationEmitter.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/violation/ComponentViolationEmitter.java
index 0560d27..f3b1c0b 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/violation/ComponentViolationEmitter.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/violation/ComponentViolationEmitter.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/violation/ComponentViolationSummary.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/violation/ComponentViolationSummary.java
index 88a5d86..16022d9 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/violation/ComponentViolationSummary.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/violation/ComponentViolationSummary.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/build.properties b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/build.properties
index ab1b400..9ab7cbf 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/build.properties
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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.componentui.jar = src/
 output.componentui.jar = bin/
 bin.includes = plugin.xml,\
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/plugin.properties b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/plugin.properties
index 194e4e4..3cb0eae 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/plugin.properties
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/plugin.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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
+###############################################################################
 LABEL_POPUP_MENU_COMPONENT=Component
 LABEL_POPUP_ACTION_API_SCAN_COMPONENT=Scan API
 EDITOR_COMPONENT_XML=Component.xml Editor
\ No newline at end of file
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/ComponentManager.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/ComponentManager.java
index 4677ac9..e7923a3 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/ComponentManager.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/ComponentManager.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/component.properties b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/component.properties
index c758496..23c51d7 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/component.properties
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/component.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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
+###############################################################################
 VIOLATION_METHOD_REF=Method {0}(...) defined in class {1} cannot be referenced.
 VIOLATION_FIELD_REF=Field {0} defined in class {1} cannot be referenced.
 VIOLATION_CLASS_REF=Class {0} cannot be referenced.
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/BundleAdapter.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/BundleAdapter.java
index 6d2d870..f7f37d8 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/BundleAdapter.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/BundleAdapter.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/BundleClazz.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/BundleClazz.java
index 4ce88f8..ee2a14f 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/BundleClazz.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/BundleClazz.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/BundleLibrary.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/BundleLibrary.java
index 8dca043..8180879 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/BundleLibrary.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/BundleLibrary.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/ComponentUIPlugin.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/ComponentUIPlugin.java
index 585ab0e..02222ac 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/ComponentUIPlugin.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/ComponentUIPlugin.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/JavaSourceFinder.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/JavaSourceFinder.java
index e5c1600..79d8ac7 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/JavaSourceFinder.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/JavaSourceFinder.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/ScannableComponent.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/ScannableComponent.java
index da21bca..b3fe102 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/ScannableComponent.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/ScannableComponent.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/WorkspaceFileLocation.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/WorkspaceFileLocation.java
index 40dbecd..e962b1c 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/WorkspaceFileLocation.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/WorkspaceFileLocation.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/WorkspacePluginXML.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/WorkspacePluginXML.java
index 28c482f..765cd9c 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/WorkspacePluginXML.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/WorkspacePluginXML.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/ScanAPI.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/ScanAPI.java
index f143f62..6978c52 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/ScanAPI.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/ScanAPI.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/APIDialog.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/APIDialog.java
index 9d8bfcb..feb7cfe 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/APIDialog.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/APIDialog.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/APIPage.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/APIPage.java
index addb0ec..750eb65 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/APIPage.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/APIPage.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentPage.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentPage.java
index 97b6dcb..1647f70 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentPage.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentPage.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentRefDialog.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentRefDialog.java
index 5fc522a..7190615 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentRefDialog.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentRefDialog.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentXMLEditor.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentXMLEditor.java
index 7a73b33..ede38ad 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentXMLEditor.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentXMLEditor.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentXMLProvider.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentXMLProvider.java
index e78195b..15818af 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentXMLProvider.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentXMLProvider.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/PluginDialog.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/PluginDialog.java
index 017e5b7..4427efe 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/PluginDialog.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/PluginDialog.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/AbstractModifyMarkersJob.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/AbstractModifyMarkersJob.java
index d0603f0..737df82 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/AbstractModifyMarkersJob.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/AbstractModifyMarkersJob.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/AbstractScanJob.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/AbstractScanJob.java
index d8a17b5..35b3a69 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/AbstractScanJob.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/AbstractScanJob.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/AddComponent.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/AddComponent.java
index 23c1a9d..f302902 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/AddComponent.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/AddComponent.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/InitComponentManager.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/InitComponentManager.java
index 0235169..578baeb 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/InitComponentManager.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/InitComponentManager.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/RemoveComponent.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/RemoveComponent.java
index c27dab9..dc186b8 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/RemoveComponent.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/RemoveComponent.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/ScanComponent.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/ScanComponent.java
index 8b75b0c..2afd425 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/ScanComponent.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/ScanComponent.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/data/eclipse.properties b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/data/eclipse.properties
index e151875..69a071d 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/data/eclipse.properties
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/data/eclipse.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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
+###############################################################################
 Ant=org.eclipse.ant.core \
  org.eclipse.ant.ui
 
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/data/emf.properties b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/data/emf.properties
index 882b584..0573a68 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/data/emf.properties
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/data/emf.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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
+###############################################################################
 emf=org.eclipse.emf.codegen.ecore.ui \
  org.eclipse.emf.codegen.ecore \
  org.eclipse.emf.codegen.ui \
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/data/gef.properties b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/data/gef.properties
index 557a324..e373714 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/data/gef.properties
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/data/gef.properties
@@ -1,2 +1,14 @@
+###############################################################################
+# Copyright (c) 2005, 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
+###############################################################################
 gef=org.eclipse.gef \
  org.eclipse.draw2d
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/data/ve.properties b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/data/ve.properties
index d7a64ab..dec7848 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/data/ve.properties
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/data/ve.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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
+###############################################################################
 jem=com.ibm.etools.emf.event \
  com.ibm.wtp.common.util \
  com.ibm.wtp.emf.workbench \
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/data/wtp.properties b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/data/wtp.properties
index cd34228..b469b7d 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/data/wtp.properties
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/data/wtp.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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
+###############################################################################
 wst.command=org.eclipse.wst.command.env \
  org.eclipse.wst.command.env.core \
  org.eclipse.wst.command.env.ui
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/APIViolationEmitter.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/APIViolationEmitter.java
index 41faec5..634b7db 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/APIViolationEmitter.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/APIViolationEmitter.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/Component.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/Component.java
index b6ed0b6..7864e1f 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/Component.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/Component.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/ComponentAPIEmitter.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/ComponentAPIEmitter.java
index 099b49c..d7bda84 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/ComponentAPIEmitter.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/ComponentAPIEmitter.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/ComponentEmitter.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/ComponentEmitter.java
index e69dfaf..7a82fe3 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/ComponentEmitter.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/ComponentEmitter.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/TestMain.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/TestMain.java
index 9fde6aa..4b12c05 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/TestMain.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/TestMain.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/Bundle.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/Bundle.java
index 8667d21..85b0088 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/Bundle.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/Bundle.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/ConfigurationFileLocator.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/ConfigurationFileLocator.java
index 10a7bc8..0ea2392 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/ConfigurationFileLocator.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/ConfigurationFileLocator.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/ConfigurationFileParser.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/ConfigurationFileParser.java
index fd7514a..418e139 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/ConfigurationFileParser.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/ConfigurationFileParser.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/EclipseInternalRules.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/EclipseInternalRules.java
index a419c36..af97d39 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/EclipseInternalRules.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/EclipseInternalRules.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/Fragment.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/Fragment.java
index 9d5cdc5..d7e094c 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/Fragment.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/Fragment.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/IInternalRules.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/IInternalRules.java
index 29c4e91..aac37a0 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/IInternalRules.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/IInternalRules.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/InternalReferenceComparator.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/InternalReferenceComparator.java
index 0ef7b51..f34bcbf 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/InternalReferenceComparator.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/InternalReferenceComparator.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/InternalTypeReference.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/InternalTypeReference.java
index cca6b38..86c225b 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/InternalTypeReference.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/InternalTypeReference.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/Library.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/Library.java
index 47ac821..2391cda 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/Library.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/Library.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/Main.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/Main.java
index 567992c..83c5529 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/Main.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/Main.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/Plugin.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/Plugin.java
index f2a4331..1636e42 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/Plugin.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/Plugin.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/ReportGenerator.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/ReportGenerator.java
index f5aaeb0..f437f5b 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/ReportGenerator.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/ReportGenerator.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/Type.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/Type.java
index ab4b2fa..fc2b98c 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/Type.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/internalreference/Type.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/AbstractZipLocation.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/AbstractZipLocation.java
index d57d4a8..b951e79 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/AbstractZipLocation.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/AbstractZipLocation.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/FileLocation.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/FileLocation.java
index d3df3ff..d8786ef 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/FileLocation.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/FileLocation.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/IFileLocation.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/IFileLocation.java
index f2a803c..df67c4e 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/IFileLocation.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/IFileLocation.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/ILocation.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/ILocation.java
index ec8d9a6..701524f 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/ILocation.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/ILocation.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/ILocationChildrenIterator.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/ILocationChildrenIterator.java
index 1e2262d..745766e 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/ILocationChildrenIterator.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/ILocationChildrenIterator.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/ILocationVisitor.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/ILocationVisitor.java
index 2a45d78..07a7675 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/ILocationVisitor.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/ILocationVisitor.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/Location.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/Location.java
index da7ef5c..794bdab 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/Location.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/Location.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/ZipEntryLocation.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/ZipEntryLocation.java
index c93f0a5..7f0b2b5 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/ZipEntryLocation.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/ZipEntryLocation.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/ZipLocation.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/ZipLocation.java
index d9632da..5be2ab0 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/ZipLocation.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/location/ZipLocation.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/util/CommandLineParser.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/util/CommandLineParser.java
index 9ffe65b..fd829c6 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/util/CommandLineParser.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/util/CommandLineParser.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/util/CommandOptionParser.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/util/CommandOptionParser.java
index 83d84fc..068fdf1 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/util/CommandOptionParser.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/util/CommandOptionParser.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/util/EmitterUtils.java b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/util/EmitterUtils.java
index 1ebc64a..d76db28 100644
--- a/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/util/EmitterUtils.java
+++ b/archive/working/apitools/org.eclipse.wtp.releng.tools.component/src/org/eclipse/wtp/releng/tools/component/util/EmitterUtils.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+�*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
diff --git a/archive/working/development/WTPDevelopmentPractices/format/team-format.xml b/archive/working/development/WTPDevelopmentPractices/format/team-format.xml
index 189a3db7..f2a755e 100644
--- a/archive/working/development/WTPDevelopmentPractices/format/team-format.xml
+++ b/archive/working/development/WTPDevelopmentPractices/format/team-format.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2004, 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
+ -->
+
 <profiles version="6">
 <profile name="SSE Formatting" version="6">
 <setting id="comment_clear_blank_lines" value="false"/>
diff --git a/assembly/features/org.apache.axis.feature/build.properties b/assembly/features/org.apache.axis.feature/build.properties
index 7edcb80..fb251ae 100644
--- a/assembly/features/org.apache.axis.feature/build.properties
+++ b/assembly/features/org.apache.axis.feature/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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 = feature.xml,\
                feature.properties,\
                LICENSE
diff --git a/assembly/features/org.apache.axis.feature/feature.properties b/assembly/features/org.apache.axis.feature/feature.properties
index be591e7..38d16d7 100644
--- a/assembly/features/org.apache.axis.feature/feature.properties
+++ b/assembly/features/org.apache.axis.feature/feature.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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
+###############################################################################
  ##########################################################################
  # 
  #                                Apache License
diff --git a/assembly/features/org.apache.axis.feature/feature.xml b/assembly/features/org.apache.axis.feature/feature.xml
index 1634e5d..a505304 100644
--- a/assembly/features/org.apache.axis.feature/feature.xml
+++ b/assembly/features/org.apache.axis.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <feature
       id="org.apache.axis.feature"
       label="%featureName"
diff --git a/assembly/features/org.apache.axis.feature/pom.xml b/assembly/features/org.apache.axis.feature/pom.xml
index 98565b6..34361c3 100644
--- a/assembly/features/org.apache.axis.feature/pom.xml
+++ b/assembly/features/org.apache.axis.feature/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/assembly/features/org.apache.commons_logging.feature/build.properties b/assembly/features/org.apache.commons_logging.feature/build.properties
index 215c62b..e6e32c4 100644
--- a/assembly/features/org.apache.commons_logging.feature/build.properties
+++ b/assembly/features/org.apache.commons_logging.feature/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2006, 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 = feature.xml,\
                feature.properties,\
                LICENSE.html
diff --git a/assembly/features/org.apache.commons_logging.feature/feature.properties b/assembly/features/org.apache.commons_logging.feature/feature.properties
index 259d518..37b4ad4 100644
--- a/assembly/features/org.apache.commons_logging.feature/feature.properties
+++ b/assembly/features/org.apache.commons_logging.feature/feature.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2006, 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
+###############################################################################
  ##########################################################################
  # 
  #                                Apache License
diff --git a/assembly/features/org.apache.commons_logging.feature/feature.xml b/assembly/features/org.apache.commons_logging.feature/feature.xml
index 9a2049d..544f0a3 100644
--- a/assembly/features/org.apache.commons_logging.feature/feature.xml
+++ b/assembly/features/org.apache.commons_logging.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2006, 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
+ -->
+
 <feature
       id="org.apache.commons_logging.feature"
       label="%featureName"
diff --git a/assembly/features/org.apache.commons_logging.feature/pom.xml b/assembly/features/org.apache.commons_logging.feature/pom.xml
index 483173b..c5f54a7 100644
--- a/assembly/features/org.apache.commons_logging.feature/pom.xml
+++ b/assembly/features/org.apache.commons_logging.feature/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/assembly/features/org.apache.jakarta_log4j.feature/build.properties b/assembly/features/org.apache.jakarta_log4j.feature/build.properties
index d97acc8..17101e3 100644
--- a/assembly/features/org.apache.jakarta_log4j.feature/build.properties
+++ b/assembly/features/org.apache.jakarta_log4j.feature/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2006, 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 = feature.xml,\
                LICENSE.txt,\
                feature.properties
diff --git a/assembly/features/org.apache.jakarta_log4j.feature/build.xml b/assembly/features/org.apache.jakarta_log4j.feature/build.xml
index 3e5e891..c894028 100644
--- a/assembly/features/org.apache.jakarta_log4j.feature/build.xml
+++ b/assembly/features/org.apache.jakarta_log4j.feature/build.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2006, 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
+ -->
+
 <project name="org.apache.jakarta_log4j.feature" default="build.update.jar" basedir=".">
 
 	<target name="init">
diff --git a/assembly/features/org.apache.jakarta_log4j.feature/feature.properties b/assembly/features/org.apache.jakarta_log4j.feature/feature.properties
index 81c4495..c248a74 100644
--- a/assembly/features/org.apache.jakarta_log4j.feature/feature.properties
+++ b/assembly/features/org.apache.jakarta_log4j.feature/feature.properties
@@ -3,7 +3,7 @@
  #                   The Apache Software License, Version 1.1
  # ============================================================================
  # 
- #    Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
+ #    Copyright (C) 1999, 2006 The Apache Software Foundation. All rights reserved.
  # 
  # Redistribution and use in source and binary forms, with or without modifica-
  # tion, are permitted provided that the following conditions are met:
diff --git a/assembly/features/org.apache.jakarta_log4j.feature/feature.xml b/assembly/features/org.apache.jakarta_log4j.feature/feature.xml
index 1e5a364..d647c89 100644
--- a/assembly/features/org.apache.jakarta_log4j.feature/feature.xml
+++ b/assembly/features/org.apache.jakarta_log4j.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2006, 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
+ -->
+
 <feature
       id="org.apache.jakarta_log4j.feature"
       label="%featureName"
diff --git a/assembly/features/org.apache.jakarta_log4j.feature/pom.xml b/assembly/features/org.apache.jakarta_log4j.feature/pom.xml
index 9d3ae0a..89fa03d 100644
--- a/assembly/features/org.apache.jakarta_log4j.feature/pom.xml
+++ b/assembly/features/org.apache.jakarta_log4j.feature/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/assembly/features/org.apache.wsil4j.feature/build.properties b/assembly/features/org.apache.wsil4j.feature/build.properties
index 7edcb80..fb251ae 100644
--- a/assembly/features/org.apache.wsil4j.feature/build.properties
+++ b/assembly/features/org.apache.wsil4j.feature/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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 = feature.xml,\
                feature.properties,\
                LICENSE
diff --git a/assembly/features/org.apache.wsil4j.feature/feature.properties b/assembly/features/org.apache.wsil4j.feature/feature.properties
index 1eccd7a..8c10cdc 100644
--- a/assembly/features/org.apache.wsil4j.feature/feature.properties
+++ b/assembly/features/org.apache.wsil4j.feature/feature.properties
@@ -2,7 +2,7 @@
  # The Apache Software License, Version 1.1
  #
  #
- # Copyright (c) 2002 The Apache Software Foundation.  All rights 
+ # Copyright (c) 2002, 2005 The Apache Software Foundation.  All rights 
  # reserved.
  #
  # Redistribution and use in source and binary forms, with or without
diff --git a/assembly/features/org.apache.wsil4j.feature/feature.xml b/assembly/features/org.apache.wsil4j.feature/feature.xml
index 0faacff..5639333 100644
--- a/assembly/features/org.apache.wsil4j.feature/feature.xml
+++ b/assembly/features/org.apache.wsil4j.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <feature
       id="org.apache.wsil4j.feature"
       label="%featureName"
diff --git a/assembly/features/org.apache.wsil4j.feature/pom.xml b/assembly/features/org.apache.wsil4j.feature/pom.xml
index c003eab..dc5a5ee 100644
--- a/assembly/features/org.apache.wsil4j.feature/pom.xml
+++ b/assembly/features/org.apache.wsil4j.feature/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/assembly/features/org.eclipse.jst.sdk/build.properties b/assembly/features/org.eclipse.jst.sdk/build.properties
index e69de29..b905b52 100644
--- a/assembly/features/org.eclipse.jst.sdk/build.properties
+++ b/assembly/features/org.eclipse.jst.sdk/build.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2004, 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
+###############################################################################
diff --git a/assembly/features/org.eclipse.jst.sdk/feature.properties b/assembly/features/org.eclipse.jst.sdk/feature.properties
index 69f26d0..fff4c25 100644
--- a/assembly/features/org.eclipse.jst.sdk/feature.properties
+++ b/assembly/features/org.eclipse.jst.sdk/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
+# Copyright (c) 2006, 2010 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
@@ -28,9 +30,9 @@
 copyright=\
 Copyright (c) 2008 IBM Corporation and others.\n\
 All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
+http://www.eclipse.org/legal/epl-2.0/\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
diff --git a/assembly/features/org.eclipse.jst.sdk/feature.xml b/assembly/features/org.eclipse.jst.sdk/feature.xml
index 213f4c8..ae7336a 100644
--- a/assembly/features/org.eclipse.jst.sdk/feature.xml
+++ b/assembly/features/org.eclipse.jst.sdk/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!--

+    Copyright (c) 2004, 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

+ -->
+
 <feature

       id="org.eclipse.jst.sdk"

       label="%featureName"

diff --git a/assembly/features/org.eclipse.jst.sdk/pom.xml b/assembly/features/org.eclipse.jst.sdk/pom.xml
index da0b4f8..66a8be2 100644
--- a/assembly/features/org.eclipse.jst.sdk/pom.xml
+++ b/assembly/features/org.eclipse.jst.sdk/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/assembly/features/org.eclipse.jst.tests/build.properties b/assembly/features/org.eclipse.jst.tests/build.properties
index e69de29..b905b52 100644
--- a/assembly/features/org.eclipse.jst.tests/build.properties
+++ b/assembly/features/org.eclipse.jst.tests/build.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2004, 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
+###############################################################################
diff --git a/assembly/features/org.eclipse.jst.tests/feature.properties b/assembly/features/org.eclipse.jst.tests/feature.properties
index 2962614..8891ca6 100644
--- a/assembly/features/org.eclipse.jst.tests/feature.properties
+++ b/assembly/features/org.eclipse.jst.tests/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
+# Copyright (c) 2006, 2010 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
@@ -28,9 +30,9 @@
 copyright=\
 Copyright (c) 2008 IBM Corporation and others.\n\
 All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
+http://www.eclipse.org/legal/epl-2.0/\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
diff --git a/assembly/features/org.eclipse.jst.tests/feature.xml b/assembly/features/org.eclipse.jst.tests/feature.xml
index 660a383..55fb9da 100644
--- a/assembly/features/org.eclipse.jst.tests/feature.xml
+++ b/assembly/features/org.eclipse.jst.tests/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!--

+    Copyright (c) 2004, 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

+ -->
+
 <feature

       id="org.eclipse.jst.tests"

       label="%featureName"

diff --git a/assembly/features/org.eclipse.jst.tests/pom.xml b/assembly/features/org.eclipse.jst.tests/pom.xml
index 44feec8..95ba81e 100644
--- a/assembly/features/org.eclipse.jst.tests/pom.xml
+++ b/assembly/features/org.eclipse.jst.tests/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/assembly/features/org.eclipse.thirdparty.assembly/build.properties b/assembly/features/org.eclipse.thirdparty.assembly/build.properties
index 6bcd28c..d11dd75 100644
--- a/assembly/features/org.eclipse.thirdparty.assembly/build.properties
+++ b/assembly/features/org.eclipse.thirdparty.assembly/build.properties
@@ -1,5 +1,17 @@
+###############################################################################
+# Copyright (c) 2006, 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 = feature.xml,\
                feature.properties,\
                license.html,\
-               epl-v10.html,\
+               epl-2.0.html,\
                eclipse_update_120.jpg
diff --git a/assembly/features/org.eclipse.thirdparty.assembly/epl-2.0.html b/assembly/features/org.eclipse.thirdparty.assembly/epl-2.0.html
new file mode 100644
index 0000000..626fd4a
--- /dev/null
+++ b/assembly/features/org.eclipse.thirdparty.assembly/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/assembly/features/org.eclipse.thirdparty.assembly/epl-v10.html b/assembly/features/org.eclipse.thirdparty.assembly/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/assembly/features/org.eclipse.thirdparty.assembly/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>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. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/assembly/features/org.eclipse.thirdparty.assembly/feature.properties b/assembly/features/org.eclipse.thirdparty.assembly/feature.properties
index 74ac66a..1a67a5b 100644
--- a/assembly/features/org.eclipse.thirdparty.assembly/feature.properties
+++ b/assembly/features/org.eclipse.thirdparty.assembly/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2006 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
@@ -30,9 +32,9 @@
 copyright=\
 Copyright (c) 2006 IBM Corporation and others.\n\
 All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
+http://www.eclipse.org/legal/epl-2.0/\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
@@ -66,8 +68,8 @@
 \n\
 Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
 is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+License Version 2.0 ("EPL"). A copy of the EPL is provided with this\n\
+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/assembly/features/org.eclipse.thirdparty.assembly/feature.xml b/assembly/features/org.eclipse.thirdparty.assembly/feature.xml
index 955364f..a85aeb8 100644
--- a/assembly/features/org.eclipse.thirdparty.assembly/feature.xml
+++ b/assembly/features/org.eclipse.thirdparty.assembly/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2006, 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
+ -->
+
 <feature
       id="org.eclipse.thirdparty.assembly"
       label="%featureName"
diff --git a/assembly/features/org.eclipse.thirdparty.assembly/license.html b/assembly/features/org.eclipse.thirdparty.assembly/license.html
index 2347060..224d07f 100644
--- a/assembly/features/org.eclipse.thirdparty.assembly/license.html
+++ b/assembly/features/org.eclipse.thirdparty.assembly/license.html
@@ -20,9 +20,9 @@
 <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 ("EPL"). A copy of the EPL is provided with this 
+Public License Version 2.0 ("EPL"). 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>. 
+href="http://www.eclipse.org/legal/epl-2.0/">http://www.eclipse.org/legal/epl-2.0/</A>. 
 For purposes of the EPL, "Program" 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.org CVS repository 
diff --git a/assembly/features/org.eclipse.thirdparty.assembly/pom.xml b/assembly/features/org.eclipse.thirdparty.assembly/pom.xml
index 7f56782..0730017 100644
--- a/assembly/features/org.eclipse.thirdparty.assembly/pom.xml
+++ b/assembly/features/org.eclipse.thirdparty.assembly/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/assembly/features/org.eclipse.wst.sdk/build.properties b/assembly/features/org.eclipse.wst.sdk/build.properties
index e69de29..b905b52 100644
--- a/assembly/features/org.eclipse.wst.sdk/build.properties
+++ b/assembly/features/org.eclipse.wst.sdk/build.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2004, 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
+###############################################################################
diff --git a/assembly/features/org.eclipse.wst.sdk/feature.properties b/assembly/features/org.eclipse.wst.sdk/feature.properties
index 16f100d..df566e0 100644
--- a/assembly/features/org.eclipse.wst.sdk/feature.properties
+++ b/assembly/features/org.eclipse.wst.sdk/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
+# Copyright (c) 2006, 2010 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
@@ -28,9 +30,9 @@
 copyright=\
 Copyright (c) 2007 IBM Corporation and others.\n\
 All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
+http://www.eclipse.org/legal/epl-2.0/\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
diff --git a/assembly/features/org.eclipse.wst.sdk/feature.xml b/assembly/features/org.eclipse.wst.sdk/feature.xml
index 1197036..897a6e6 100644
--- a/assembly/features/org.eclipse.wst.sdk/feature.xml
+++ b/assembly/features/org.eclipse.wst.sdk/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!--

+    Copyright (c) 2004, 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

+ -->
+
 <feature

       id="org.eclipse.wst.sdk"

       label="%featureName"

diff --git a/assembly/features/org.eclipse.wst.sdk/pom.xml b/assembly/features/org.eclipse.wst.sdk/pom.xml
index abbc2b3..32f34b2 100644
--- a/assembly/features/org.eclipse.wst.sdk/pom.xml
+++ b/assembly/features/org.eclipse.wst.sdk/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/assembly/features/org.eclipse.wst.tests.feature/build.properties b/assembly/features/org.eclipse.wst.tests.feature/build.properties
index e69de29..b905b52 100644
--- a/assembly/features/org.eclipse.wst.tests.feature/build.properties
+++ b/assembly/features/org.eclipse.wst.tests.feature/build.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2004, 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
+###############################################################################
diff --git a/assembly/features/org.eclipse.wst.tests.feature/feature.properties b/assembly/features/org.eclipse.wst.tests.feature/feature.properties
index 22ff7cc..145348e 100644
--- a/assembly/features/org.eclipse.wst.tests.feature/feature.properties
+++ b/assembly/features/org.eclipse.wst.tests.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
+# Copyright (c) 2006, 2010 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
@@ -28,9 +30,9 @@
 copyright=\
 Copyright (c) 2008 IBM Corporation and others.\n\
 All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
+http://www.eclipse.org/legal/epl-2.0/\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
diff --git a/assembly/features/org.eclipse.wst.tests.feature/feature.xml b/assembly/features/org.eclipse.wst.tests.feature/feature.xml
index 034baae..c21982b 100644
--- a/assembly/features/org.eclipse.wst.tests.feature/feature.xml
+++ b/assembly/features/org.eclipse.wst.tests.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!--

+    Copyright (c) 2004, 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

+ -->
+
 <feature

       id="org.eclipse.wst.tests.feature"

       label="%featureName"

diff --git a/assembly/features/org.eclipse.wst.tests.feature/pom.xml b/assembly/features/org.eclipse.wst.tests.feature/pom.xml
index 8596312..12002d4 100644
--- a/assembly/features/org.eclipse.wst.tests.feature/pom.xml
+++ b/assembly/features/org.eclipse.wst.tests.feature/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/assembly/features/org.eclipse.wtp.noship.assembly.feature/build.properties b/assembly/features/org.eclipse.wtp.noship.assembly.feature/build.properties
index 64f93a9..7954cbc 100644
--- a/assembly/features/org.eclipse.wtp.noship.assembly.feature/build.properties
+++ b/assembly/features/org.eclipse.wtp.noship.assembly.feature/build.properties
@@ -1 +1,13 @@
+###############################################################################
+# Copyright (c) 2006, 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 = feature.xml
diff --git a/assembly/features/org.eclipse.wtp.noship.assembly.feature/feature.xml b/assembly/features/org.eclipse.wtp.noship.assembly.feature/feature.xml
index 040f0ac..33daeea 100644
--- a/assembly/features/org.eclipse.wtp.noship.assembly.feature/feature.xml
+++ b/assembly/features/org.eclipse.wtp.noship.assembly.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2006, 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
+ -->
+
 <feature
       id="org.eclipse.wtp.noship.assembly.feature"
       label="No_Ship_Assembly_Feature Feature"
diff --git a/assembly/features/org.eclipse.wtp.noship.assembly.feature/pom.xml b/assembly/features/org.eclipse.wtp.noship.assembly.feature/pom.xml
index 812775f..2c25b5c 100644
--- a/assembly/features/org.eclipse.wtp.noship.assembly.feature/pom.xml
+++ b/assembly/features/org.eclipse.wtp.noship.assembly.feature/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/assembly/features/org.eclipse.wtp.patch.assembly.feature/build.properties b/assembly/features/org.eclipse.wtp.patch.assembly.feature/build.properties
index 64f93a9..771bfe7 100644
--- a/assembly/features/org.eclipse.wtp.patch.assembly.feature/build.properties
+++ b/assembly/features/org.eclipse.wtp.patch.assembly.feature/build.properties
@@ -1 +1,13 @@
+###############################################################################
+# 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 = feature.xml
diff --git a/assembly/features/org.eclipse.wtp.patch.assembly.feature/feature.xml b/assembly/features/org.eclipse.wtp.patch.assembly.feature/feature.xml
index d9c9d95..47e8f61 100644
--- a/assembly/features/org.eclipse.wtp.patch.assembly.feature/feature.xml
+++ b/assembly/features/org.eclipse.wtp.patch.assembly.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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
+ -->
+
 <feature
       id="org.eclipse.wtp.patch.assembly.feature"
       label="Patch Assembly Feature"
diff --git a/assembly/features/org.eclipse.wtp.patch.assembly.feature/pom.xml b/assembly/features/org.eclipse.wtp.patch.assembly.feature/pom.xml
index eebf4af..7b017bc 100644
--- a/assembly/features/org.eclipse.wtp.patch.assembly.feature/pom.xml
+++ b/assembly/features/org.eclipse.wtp.patch.assembly.feature/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/assembly/features/org.eclipse.wtp.patch.tests.assembly.feature/build.properties b/assembly/features/org.eclipse.wtp.patch.tests.assembly.feature/build.properties
index 64f93a9..771bfe7 100644
--- a/assembly/features/org.eclipse.wtp.patch.tests.assembly.feature/build.properties
+++ b/assembly/features/org.eclipse.wtp.patch.tests.assembly.feature/build.properties
@@ -1 +1,13 @@
+###############################################################################
+# 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 = feature.xml
diff --git a/assembly/features/org.eclipse.wtp.patch.tests.assembly.feature/feature.xml b/assembly/features/org.eclipse.wtp.patch.tests.assembly.feature/feature.xml
index 5fbae35..5e862ab 100644
--- a/assembly/features/org.eclipse.wtp.patch.tests.assembly.feature/feature.xml
+++ b/assembly/features/org.eclipse.wtp.patch.tests.assembly.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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
+ -->
+
 <feature
       id="org.eclipse.wtp.patch.tests.assembly.feature"
       label="Feature Feature"
diff --git a/assembly/features/org.eclipse.wtp.patch.tests.assembly.feature/pom.xml b/assembly/features/org.eclipse.wtp.patch.tests.assembly.feature/pom.xml
index e7cc715..0f77367 100644
--- a/assembly/features/org.eclipse.wtp.patch.tests.assembly.feature/pom.xml
+++ b/assembly/features/org.eclipse.wtp.patch.tests.assembly.feature/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/assembly/features/org.eclipse.wtp.requiredpreques/build.properties b/assembly/features/org.eclipse.wtp.requiredpreques/build.properties
index e69de29..f428f72 100644
--- a/assembly/features/org.eclipse.wtp.requiredpreques/build.properties
+++ b/assembly/features/org.eclipse.wtp.requiredpreques/build.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# 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
+###############################################################################
diff --git a/assembly/features/org.eclipse.wtp.requiredpreques/epl-2.0.html b/assembly/features/org.eclipse.wtp.requiredpreques/epl-2.0.html
new file mode 100644
index 0000000..626fd4a
--- /dev/null
+++ b/assembly/features/org.eclipse.wtp.requiredpreques/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/assembly/features/org.eclipse.wtp.requiredpreques/epl-v10.html b/assembly/features/org.eclipse.wtp.requiredpreques/epl-v10.html
deleted file mode 100644
index abeecc4..0000000
--- a/assembly/features/org.eclipse.wtp.requiredpreques/epl-v10.html
+++ /dev/null
@@ -1,262 +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/assembly/features/org.eclipse.wtp.requiredpreques/feature.properties b/assembly/features/org.eclipse.wtp.requiredpreques/feature.properties
index 550e2db..e41b2b7 100644
--- a/assembly/features/org.eclipse.wtp.requiredpreques/feature.properties
+++ b/assembly/features/org.eclipse.wtp.requiredpreques/feature.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
@@ -32,9 +34,9 @@
 copyright=\
 Copyright (c) 2010 IBM Corporation and others.\n\
 All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
+http://www.eclipse.org/legal/epl-2.0/\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
@@ -68,8 +70,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/assembly/features/org.eclipse.wtp.requiredpreques/feature.xml b/assembly/features/org.eclipse.wtp.requiredpreques/feature.xml
index 4c40c32..6280a8f 100644
--- a/assembly/features/org.eclipse.wtp.requiredpreques/feature.xml
+++ b/assembly/features/org.eclipse.wtp.requiredpreques/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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
+ -->
+
 <feature
       id="org.eclipse.wtp.requiredpreques"
       label="Patch Prereqs for WTP 322"
diff --git a/assembly/features/org.eclipse.wtp.requiredpreques/license.html b/assembly/features/org.eclipse.wtp.requiredpreques/license.html
index c184ca3..d3d2c5b 100644
--- a/assembly/features/org.eclipse.wtp.requiredpreques/license.html
+++ b/assembly/features/org.eclipse.wtp.requiredpreques/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/assembly/features/org.eclipse.wtp.requiredpreques/pom.xml b/assembly/features/org.eclipse.wtp.requiredpreques/pom.xml
index 9b3e335..453740b 100644
--- a/assembly/features/org.eclipse.wtp.requiredpreques/pom.xml
+++ b/assembly/features/org.eclipse.wtp.requiredpreques/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/assembly/features/org.eclipse.wtp.xml.dev.feature/build.properties b/assembly/features/org.eclipse.wtp.xml.dev.feature/build.properties
index 64f93a9..8e428fd 100644
--- a/assembly/features/org.eclipse.wtp.xml.dev.feature/build.properties
+++ b/assembly/features/org.eclipse.wtp.xml.dev.feature/build.properties
@@ -1 +1,13 @@
+###############################################################################
+# Copyright (c) 2008, 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 = feature.xml
diff --git a/assembly/features/org.eclipse.wtp.xml.dev.feature/feature.xml b/assembly/features/org.eclipse.wtp.xml.dev.feature/feature.xml
index 483e37c..7710791 100644
--- a/assembly/features/org.eclipse.wtp.xml.dev.feature/feature.xml
+++ b/assembly/features/org.eclipse.wtp.xml.dev.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2008, 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
+ -->
+
 <feature
       id="org.eclipse.wtp.xml.dev.assembly.feature"
       label="Dev Feature"
diff --git a/assembly/features/org.eclipse.wtp.xml.dev.feature/pom.xml b/assembly/features/org.eclipse.wtp.xml.dev.feature/pom.xml
index 78d7f51..c0349ff 100644
--- a/assembly/features/org.eclipse.wtp.xml.dev.feature/pom.xml
+++ b/assembly/features/org.eclipse.wtp.xml.dev.feature/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/assembly/features/org.uddi4j.feature/build.properties b/assembly/features/org.uddi4j.feature/build.properties
index 215c62b..0863146 100644
--- a/assembly/features/org.uddi4j.feature/build.properties
+++ b/assembly/features/org.uddi4j.feature/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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 = feature.xml,\
                feature.properties,\
                LICENSE.html
diff --git a/assembly/features/org.uddi4j.feature/feature.properties b/assembly/features/org.uddi4j.feature/feature.properties
index cd32eb9..e9146f4 100644
--- a/assembly/features/org.uddi4j.feature/feature.properties
+++ b/assembly/features/org.uddi4j.feature/feature.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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
+###############################################################################
 ###########################################################################
 # IBM Public License Version 1.0 
 # THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS IBM PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. 
diff --git a/assembly/features/org.uddi4j.feature/feature.xml b/assembly/features/org.uddi4j.feature/feature.xml
index 6de614b..fe7443d 100644
--- a/assembly/features/org.uddi4j.feature/feature.xml
+++ b/assembly/features/org.uddi4j.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <feature
       id="org.uddi4j.feature"
       label="%featureName"
diff --git a/assembly/features/org.uddi4j.feature/pom.xml b/assembly/features/org.uddi4j.feature/pom.xml
index 838a41c..5eccccf 100644
--- a/assembly/features/org.uddi4j.feature/pom.xml
+++ b/assembly/features/org.uddi4j.feature/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/assembly/features/org.wsdl4j.feature/build.properties b/assembly/features/org.wsdl4j.feature/build.properties
index 52c3cfc..d5459c6 100644
--- a/assembly/features/org.wsdl4j.feature/build.properties
+++ b/assembly/features/org.wsdl4j.feature/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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 = feature.xml,\
                license.html,\
                feature.properties
diff --git a/assembly/features/org.wsdl4j.feature/feature.properties b/assembly/features/org.wsdl4j.feature/feature.properties
index 5f864f7..2b96f65 100644
--- a/assembly/features/org.wsdl4j.feature/feature.properties
+++ b/assembly/features/org.wsdl4j.feature/feature.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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
+###############################################################################
 ###########################################################################
 # Common Public License - v 1.0 
 # 
diff --git a/assembly/features/org.wsdl4j.feature/feature.xml b/assembly/features/org.wsdl4j.feature/feature.xml
index adc753a..99895fa 100644
--- a/assembly/features/org.wsdl4j.feature/feature.xml
+++ b/assembly/features/org.wsdl4j.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <feature
       id="org.wsdl4j.feature"
       label="%featureName"
diff --git a/assembly/features/org.wsdl4j.feature/pom.xml b/assembly/features/org.wsdl4j.feature/pom.xml
index 2b882f7..80e0023 100644
--- a/assembly/features/org.wsdl4j.feature/pom.xml
+++ b/assembly/features/org.wsdl4j.feature/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/assembly/plugins/org.eclipse.jst/about.html b/assembly/plugins/org.eclipse.jst/about.html
index 2199df3..c63edfa 100644
--- a/assembly/plugins/org.eclipse.jst/about.html
+++ b/assembly/plugins/org.eclipse.jst/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/assembly/plugins/org.eclipse.jst/about.properties b/assembly/plugins/org.eclipse.jst/about.properties
index a0499cf..b74682f 100644
--- a/assembly/plugins/org.eclipse.jst/about.properties
+++ b/assembly/plugins/org.eclipse.jst/about.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-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/assembly/plugins/org.eclipse.jst/build.properties b/assembly/plugins/org.eclipse.jst/build.properties
index 6faea39..c81075d 100644
--- a/assembly/plugins/org.eclipse.jst/build.properties
+++ b/assembly/plugins/org.eclipse.jst/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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.ini,\
                about.html,\
diff --git a/assembly/plugins/org.eclipse.jst/plugin.properties b/assembly/plugins/org.eclipse.jst/plugin.properties
index 1251594..2418910 100644
--- a/assembly/plugins/org.eclipse.jst/plugin.properties
+++ b/assembly/plugins/org.eclipse.jst/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
+# Copyright (c) 2005, 2006 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-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/assembly/plugins/org.eclipse.jst/pom.xml b/assembly/plugins/org.eclipse.jst/pom.xml
index de2a006..870f915 100644
--- a/assembly/plugins/org.eclipse.jst/pom.xml
+++ b/assembly/plugins/org.eclipse.jst/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/assembly/plugins/org.eclipse.wst/about.html b/assembly/plugins/org.eclipse.wst/about.html
index 2199df3..c63edfa 100644
--- a/assembly/plugins/org.eclipse.wst/about.html
+++ b/assembly/plugins/org.eclipse.wst/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/assembly/plugins/org.eclipse.wst/about.properties b/assembly/plugins/org.eclipse.wst/about.properties
index 9626198..ed5f4af 100644
--- a/assembly/plugins/org.eclipse.wst/about.properties
+++ b/assembly/plugins/org.eclipse.wst/about.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-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/assembly/plugins/org.eclipse.wst/build.properties b/assembly/plugins/org.eclipse.wst/build.properties
index 1311e2a..2bd2ffc 100644
--- a/assembly/plugins/org.eclipse.wst/build.properties
+++ b/assembly/plugins/org.eclipse.wst/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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,\
                about.ini,\
diff --git a/assembly/plugins/org.eclipse.wst/plugin.properties b/assembly/plugins/org.eclipse.wst/plugin.properties
index 01116d6..0250d35 100644
--- a/assembly/plugins/org.eclipse.wst/plugin.properties
+++ b/assembly/plugins/org.eclipse.wst/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
+# Copyright (c) 2005, 2006 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-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/assembly/plugins/org.eclipse.wst/pom.xml b/assembly/plugins/org.eclipse.wst/pom.xml
index 326e9e3..05d9281 100644
--- a/assembly/plugins/org.eclipse.wst/pom.xml
+++ b/assembly/plugins/org.eclipse.wst/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/assembly/plugins/org.eclipse.wtp.xml.dev/about.html b/assembly/plugins/org.eclipse.wtp.xml.dev/about.html
index 2199df3..c63edfa 100644
--- a/assembly/plugins/org.eclipse.wtp.xml.dev/about.html
+++ b/assembly/plugins/org.eclipse.wtp.xml.dev/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/assembly/plugins/org.eclipse.wtp.xml.dev/about.properties b/assembly/plugins/org.eclipse.wtp.xml.dev/about.properties
index 1beabd0..8b6f56f 100644
--- a/assembly/plugins/org.eclipse.wtp.xml.dev/about.properties
+++ b/assembly/plugins/org.eclipse.wtp.xml.dev/about.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
+# Copyright (c) 2005, 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-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/assembly/plugins/org.eclipse.wtp.xml.dev/build.properties b/assembly/plugins/org.eclipse.wtp.xml.dev/build.properties
index 4dfde80..dfa5db0 100644
--- a/assembly/plugins/org.eclipse.wtp.xml.dev/build.properties
+++ b/assembly/plugins/org.eclipse.wtp.xml.dev/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2008, 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,\
                about.ini,\
diff --git a/assembly/plugins/org.eclipse.wtp.xml.dev/plugin.properties b/assembly/plugins/org.eclipse.wtp.xml.dev/plugin.properties
index 7174680..e8e2e85 100644
--- a/assembly/plugins/org.eclipse.wtp.xml.dev/plugin.properties
+++ b/assembly/plugins/org.eclipse.wtp.xml.dev/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
+# Copyright (c) 2005, 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-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/assembly/plugins/org.eclipse.wtp.xml.dev/pom.xml b/assembly/plugins/org.eclipse.wtp.xml.dev/pom.xml
index b74ba89..a9ead19 100644
--- a/assembly/plugins/org.eclipse.wtp.xml.dev/pom.xml
+++ b/assembly/plugins/org.eclipse.wtp.xml.dev/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/docs/org.eclipse.jst.doc.isv/about.html b/docs/org.eclipse.jst.doc.isv/about.html
index 2199df3..c63edfa 100644
--- a/docs/org.eclipse.jst.doc.isv/about.html
+++ b/docs/org.eclipse.jst.doc.isv/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/docs/org.eclipse.jst.doc.isv/api-overview/overview.xml b/docs/org.eclipse.jst.doc.isv/api-overview/overview.xml
index 9d8fa9c..3069a8a 100644
--- a/docs/org.eclipse.jst.doc.isv/api-overview/overview.xml
+++ b/docs/org.eclipse.jst.doc.isv/api-overview/overview.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <html>
 	<head>
 		<meta name="root" content=".." />
diff --git a/docs/org.eclipse.jst.doc.isv/build.properties b/docs/org.eclipse.jst.doc.isv/build.properties
index 93fe21a..096b0fd 100644
--- a/docs/org.eclipse.jst.doc.isv/build.properties
+++ b/docs/org.eclipse.jst.doc.isv/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-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/docs/org.eclipse.jst.doc.isv/build.xml b/docs/org.eclipse.jst.doc.isv/build.xml
index a73404e..2e3ce2c 100644
--- a/docs/org.eclipse.jst.doc.isv/build.xml
+++ b/docs/org.eclipse.jst.doc.isv/build.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <project
     name="org.eclipse.jst.doc.isv"
     default="build.jars"
diff --git a/docs/org.eclipse.jst.doc.isv/buildExtDocs.properties b/docs/org.eclipse.jst.doc.isv/buildExtDocs.properties
index 936d3bd..1970b87 100644
--- a/docs/org.eclipse.jst.doc.isv/buildExtDocs.properties
+++ b/docs/org.eclipse.jst.doc.isv/buildExtDocs.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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
+###############################################################################
 ################################################################
 # Information for extension point overview document
 ################################################################
diff --git a/docs/org.eclipse.jst.doc.isv/buildExtDocs.xml b/docs/org.eclipse.jst.doc.isv/buildExtDocs.xml
index 7bcff6a..4f4d136 100644
--- a/docs/org.eclipse.jst.doc.isv/buildExtDocs.xml
+++ b/docs/org.eclipse.jst.doc.isv/buildExtDocs.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <project name="Build Extension Point Documentation" default="createExtDocs" basedir=".">
 
 	<property file="buildExtDocs.properties"/>
diff --git a/docs/org.eclipse.jst.doc.isv/extDocListings.xml b/docs/org.eclipse.jst.doc.isv/extDocListings.xml
index de7daad..f2da8c3 100644
--- a/docs/org.eclipse.jst.doc.isv/extDocListings.xml
+++ b/docs/org.eclipse.jst.doc.isv/extDocListings.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <components>
 	<component name="Enterprise Java" id="enterprise" file="entextdocs.xml"/>
 	<component name="Server" id="server" file="serverextdocs.xml"/>
diff --git a/docs/org.eclipse.jst.doc.isv/javadoc.properties b/docs/org.eclipse.jst.doc.isv/javadoc.properties
index a204b27..84c2514 100644
--- a/docs/org.eclipse.jst.doc.isv/javadoc.properties
+++ b/docs/org.eclipse.jst.doc.isv/javadoc.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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.sourcefolders=../org.eclipse.jst.common.frameworks/src;\
 ../org.eclipse.jst.common.annotations.controller/controller;\
diff --git a/docs/org.eclipse.jst.doc.isv/javadoc.xml b/docs/org.eclipse.jst.doc.isv/javadoc.xml
index c3e44f6..5c01331 100644
--- a/docs/org.eclipse.jst.doc.isv/javadoc.xml
+++ b/docs/org.eclipse.jst.doc.isv/javadoc.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <project
     name="javadoc"
     default="main"
diff --git a/docs/org.eclipse.jst.doc.isv/plugin.properties b/docs/org.eclipse.jst.doc.isv/plugin.properties
index b78a484..6d9f723 100644
--- a/docs/org.eclipse.jst.doc.isv/plugin.properties
+++ b/docs/org.eclipse.jst.doc.isv/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
+# Copyright (c) 2005, 2006 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-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/docs/org.eclipse.jst.doc.isv/pom.xml b/docs/org.eclipse.jst.doc.isv/pom.xml
index e132683..027d9ca 100644
--- a/docs/org.eclipse.jst.doc.isv/pom.xml
+++ b/docs/org.eclipse.jst.doc.isv/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/docs/org.eclipse.jst.doc.isv/template-package.xml b/docs/org.eclipse.jst.doc.isv/template-package.xml
index eeed5ad..9e88b7d 100644
--- a/docs/org.eclipse.jst.doc.isv/template-package.xml
+++ b/docs/org.eclipse.jst.doc.isv/template-package.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <html>
 	<!--  This file should be renamed to "package.xml" and placed within the API 
 			package that you're summarizing.
diff --git a/docs/org.eclipse.jst.doc.isv/toc.xml b/docs/org.eclipse.jst.doc.isv/toc.xml
index c5abf46..adc3e70 100644
--- a/docs/org.eclipse.jst.doc.isv/toc.xml
+++ b/docs/org.eclipse.jst.doc.isv/toc.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <!-- ============================================================================= -->
 <!-- Define the top level topics                                                   -->
 <!-- ============================================================================= -->
diff --git a/docs/org.eclipse.jst.doc.isv/toc_JST.xml b/docs/org.eclipse.jst.doc.isv/toc_JST.xml
index 0ff3e5e..a2a0fee 100644
--- a/docs/org.eclipse.jst.doc.isv/toc_JST.xml
+++ b/docs/org.eclipse.jst.doc.isv/toc_JST.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
 
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <toc label="Programmer's Guide" href="html/plugin_descriptions_JST/jst.html">
 	<topic label="Assembly Tools"
 		href="html/plugin_descriptions_WST/assembly.html">
diff --git a/docs/org.eclipse.jst.doc.isv/topics_Reference.xml b/docs/org.eclipse.jst.doc.isv/topics_Reference.xml
index 535b94d..1f37404 100644
--- a/docs/org.eclipse.jst.doc.isv/topics_Reference.xml
+++ b/docs/org.eclipse.jst.doc.isv/topics_Reference.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <!-- ============================================================================= -->
 <!-- Define topics for the references                                              -->
 <!-- ============================================================================= -->
diff --git a/docs/org.eclipse.wst.doc.isv/about.html b/docs/org.eclipse.wst.doc.isv/about.html
index 2199df3..c63edfa 100644
--- a/docs/org.eclipse.wst.doc.isv/about.html
+++ b/docs/org.eclipse.wst.doc.isv/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/docs/org.eclipse.wst.doc.isv/api-overview/overview.xml b/docs/org.eclipse.wst.doc.isv/api-overview/overview.xml
index c657f89..418e81f 100644
--- a/docs/org.eclipse.wst.doc.isv/api-overview/overview.xml
+++ b/docs/org.eclipse.wst.doc.isv/api-overview/overview.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <html>
 	<head>
 		<meta name="root" content=".." />
diff --git a/docs/org.eclipse.wst.doc.isv/build.properties b/docs/org.eclipse.wst.doc.isv/build.properties
index ae39445..5daa8ac 100644
--- a/docs/org.eclipse.wst.doc.isv/build.properties
+++ b/docs/org.eclipse.wst.doc.isv/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2000, 2005 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-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/docs/org.eclipse.wst.doc.isv/build.xml b/docs/org.eclipse.wst.doc.isv/build.xml
index 132af1d..04e1e09 100644
--- a/docs/org.eclipse.wst.doc.isv/build.xml
+++ b/docs/org.eclipse.wst.doc.isv/build.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <project
     name="org.eclipse.wst.doc.isv"
     default="build.jars"
diff --git a/docs/org.eclipse.wst.doc.isv/buildExtDocs.properties b/docs/org.eclipse.wst.doc.isv/buildExtDocs.properties
index 7757c3a..b31909e 100644
--- a/docs/org.eclipse.wst.doc.isv/buildExtDocs.properties
+++ b/docs/org.eclipse.wst.doc.isv/buildExtDocs.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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
+###############################################################################
 ################################################################
 # Information for extension point overview document
 ################################################################
diff --git a/docs/org.eclipse.wst.doc.isv/buildExtDocs.xml b/docs/org.eclipse.wst.doc.isv/buildExtDocs.xml
index 2eb285f..2b0b458 100644
--- a/docs/org.eclipse.wst.doc.isv/buildExtDocs.xml
+++ b/docs/org.eclipse.wst.doc.isv/buildExtDocs.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <project name="Build Extension Point Documentation" default="createExtDocs" basedir=".">
 
 	<property file="buildExtDocs.properties"/>
diff --git a/docs/org.eclipse.wst.doc.isv/extDocListings.xml b/docs/org.eclipse.wst.doc.isv/extDocListings.xml
index 4a55448..a4d7575 100644
--- a/docs/org.eclipse.wst.doc.isv/extDocListings.xml
+++ b/docs/org.eclipse.wst.doc.isv/extDocListings.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <components>
 	<component name="XML" id="xml" file="xmlextdocs.xml"/>
 	<component name="Common" id="common" file="commonextdocs.xml"/>
diff --git a/docs/org.eclipse.wst.doc.isv/javadoc.properties b/docs/org.eclipse.wst.doc.isv/javadoc.properties
index 96606d1..cf40680 100644
--- a/docs/org.eclipse.wst.doc.isv/javadoc.properties
+++ b/docs/org.eclipse.wst.doc.isv/javadoc.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 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.sourcefolders=../org.eclipse.wst.common.modulecore/modulecore-src;\
diff --git a/docs/org.eclipse.wst.doc.isv/javadoc.xml b/docs/org.eclipse.wst.doc.isv/javadoc.xml
index 674b45e..80ac6d9 100644
--- a/docs/org.eclipse.wst.doc.isv/javadoc.xml
+++ b/docs/org.eclipse.wst.doc.isv/javadoc.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <project
     name="javadoc"
     default="main"
diff --git a/docs/org.eclipse.wst.doc.isv/plugin.properties b/docs/org.eclipse.wst.doc.isv/plugin.properties
index 914e472..18dbc08 100644
--- a/docs/org.eclipse.wst.doc.isv/plugin.properties
+++ b/docs/org.eclipse.wst.doc.isv/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-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/docs/org.eclipse.wst.doc.isv/pom.xml b/docs/org.eclipse.wst.doc.isv/pom.xml
index 069a478..ef769d6 100644
--- a/docs/org.eclipse.wst.doc.isv/pom.xml
+++ b/docs/org.eclipse.wst.doc.isv/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/docs/org.eclipse.wst.doc.isv/template-package.xml b/docs/org.eclipse.wst.doc.isv/template-package.xml
index e32f192..e918517 100644
--- a/docs/org.eclipse.wst.doc.isv/template-package.xml
+++ b/docs/org.eclipse.wst.doc.isv/template-package.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <html>
 	<!--  This file should be renamed to "package.xml" and placed within the API 
 			package that you're summarizing.
diff --git a/docs/org.eclipse.wst.doc.isv/toc.xml b/docs/org.eclipse.wst.doc.isv/toc.xml
index 5637197..e812338 100644
--- a/docs/org.eclipse.wst.doc.isv/toc.xml
+++ b/docs/org.eclipse.wst.doc.isv/toc.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <!-- ============================================================================= -->
 <!-- Define the top level topics                                                   -->
 <!-- ============================================================================= -->
diff --git a/docs/org.eclipse.wst.doc.isv/toc_WST.xml b/docs/org.eclipse.wst.doc.isv/toc_WST.xml
index d4f85aa..c80252d 100644
--- a/docs/org.eclipse.wst.doc.isv/toc_WST.xml
+++ b/docs/org.eclipse.wst.doc.isv/toc_WST.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
 
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <toc label="Programmer's Guide" href="html/plugin_descriptions_wst/wst.html">
 	<topic label="Command/Common Tools"
 		href="html/plugin_descriptions_WST/common_command.html">
diff --git a/docs/org.eclipse.wst.doc.isv/topics_Reference.xml b/docs/org.eclipse.wst.doc.isv/topics_Reference.xml
index 535b94d..1f37404 100644
--- a/docs/org.eclipse.wst.doc.isv/topics_Reference.xml
+++ b/docs/org.eclipse.wst.doc.isv/topics_Reference.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
+<!--
+    Copyright (c) 2005, 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
+ -->
+
 <!-- ============================================================================= -->
 <!-- Define topics for the references                                              -->
 <!-- ============================================================================= -->
diff --git a/downloadsites/archiveServer-webtools/commonPages/getFreshFromCVS.sh b/downloadsites/archiveServer-webtools/commonPages/getFreshFromCVS.sh
index f36d9e9..d17a2aa 100644
--- a/downloadsites/archiveServer-webtools/commonPages/getFreshFromCVS.sh
+++ b/downloadsites/archiveServer-webtools/commonPages/getFreshFromCVS.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+#*******************************************************************************
+# 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
+#*******************************************************************************
 
 # This script file is to help get fresh files from cvs
 
diff --git a/downloadsites/buildServer-shared-webtools/committers/runXSLT.sh b/downloadsites/buildServer-shared-webtools/committers/runXSLT.sh
index 221a05e..c514f1b 100644
--- a/downloadsites/buildServer-shared-webtools/committers/runXSLT.sh
+++ b/downloadsites/buildServer-shared-webtools/committers/runXSLT.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+#*******************************************************************************
+# 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
+#*******************************************************************************
 
 # remember to leave no slashes on commonVariations in source command,
 # so that users path is used to find it (first). But, path on
diff --git a/downloadsites/buildServer-shared-webtools/committers/transformReportsToHTML.xml b/downloadsites/buildServer-shared-webtools/committers/transformReportsToHTML.xml
index 1f4855b..1fe7eac 100644
--- a/downloadsites/buildServer-shared-webtools/committers/transformReportsToHTML.xml
+++ b/downloadsites/buildServer-shared-webtools/committers/transformReportsToHTML.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
+ -->
+
 <project
     name="xsl-conversion"
     default="main"
diff --git a/downloadsites/buildServer-shared-webtools/commonPages/getFreshFromCVS.sh b/downloadsites/buildServer-shared-webtools/commonPages/getFreshFromCVS.sh
index 5289246..55dea3e 100644
--- a/downloadsites/buildServer-shared-webtools/commonPages/getFreshFromCVS.sh
+++ b/downloadsites/buildServer-shared-webtools/commonPages/getFreshFromCVS.sh
@@ -1,4 +1,16 @@
 #!/bin/sh

+#*******************************************************************************

+# 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

+#*******************************************************************************

 

 # This script file is to help get fresh files from cvs

 

diff --git a/downloadsites/downloadServer-webtools/commonPages/getFreshFromCVS.sh b/downloadsites/downloadServer-webtools/commonPages/getFreshFromCVS.sh
index f36d9e9..d17a2aa 100755
--- a/downloadsites/downloadServer-webtools/commonPages/getFreshFromCVS.sh
+++ b/downloadsites/downloadServer-webtools/commonPages/getFreshFromCVS.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+#*******************************************************************************
+# 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
+#*******************************************************************************
 
 # This script file is to help get fresh files from cvs
 
diff --git a/downloadsites/downloadServer-webtools/downloads/renameBuild.sh b/downloadsites/downloadServer-webtools/downloads/renameBuild.sh
index e5db4b3..2d6617c 100644
--- a/downloadsites/downloadServer-webtools/downloads/renameBuild.sh
+++ b/downloadsites/downloadServer-webtools/downloads/renameBuild.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
+#*******************************************************************************
 
 # Important: it is assumed this script is ran from the directory 
 # that is the parent of the directory to rename
diff --git a/downloadsites/obsolete/indexPage30/buildmachineinfo.properties b/downloadsites/obsolete/indexPage30/buildmachineinfo.properties
index cf68068..835d554 100644
--- a/downloadsites/obsolete/indexPage30/buildmachineinfo.properties
+++ b/downloadsites/obsolete/indexPage30/buildmachineinfo.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2008, 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
+###############################################################################
  buildComputer=build
 
             buildOS=${env.OS}
diff --git a/downloadsites/obsolete/indexPage30/compilelogsSummary.xml b/downloadsites/obsolete/indexPage30/compilelogsSummary.xml
index eb1c3a7..3219316 100644
--- a/downloadsites/obsolete/indexPage30/compilelogsSummary.xml
+++ b/downloadsites/obsolete/indexPage30/compilelogsSummary.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2008, 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
+ -->
+
 <compileSummary>
     <summaryItem>
         <name>totalBundles</name>
diff --git a/downloadsites/obsolete/miscNotUsedNow/runXSLT.sh b/downloadsites/obsolete/miscNotUsedNow/runXSLT.sh
index 221a05e..c514f1b 100644
--- a/downloadsites/obsolete/miscNotUsedNow/runXSLT.sh
+++ b/downloadsites/obsolete/miscNotUsedNow/runXSLT.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+#*******************************************************************************
+# 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
+#*******************************************************************************
 
 # remember to leave no slashes on commonVariations in source command,
 # so that users path is used to find it (first). But, path on
diff --git a/downloadsites/obsolete/miscNotUsedNow/transformReportsToHTML.xml b/downloadsites/obsolete/miscNotUsedNow/transformReportsToHTML.xml
index 1f4855b..1fe7eac 100644
--- a/downloadsites/obsolete/miscNotUsedNow/transformReportsToHTML.xml
+++ b/downloadsites/obsolete/miscNotUsedNow/transformReportsToHTML.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
+ -->
+
 <project
     name="xsl-conversion"
     default="main"
diff --git a/features/org.eclipse.jpt.feature.patch/build.properties b/features/org.eclipse.jpt.feature.patch/build.properties
index cb50260..487c476 100644
--- a/features/org.eclipse.jpt.feature.patch/build.properties
+++ b/features/org.eclipse.jpt.feature.patch/build.properties
@@ -1,5 +1,17 @@
+###############################################################################
+# Copyright (c) 2008, 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 = feature.xml,\
                license.html,\
                feature.properties,\
-               epl-v10.html,\
+               epl-2.0.html,\
                eclipse_update_120.jpg
diff --git a/features/org.eclipse.jpt.feature.patch/epl-2.0.html b/features/org.eclipse.jpt.feature.patch/epl-2.0.html
new file mode 100644
index 0000000..626fd4a
--- /dev/null
+++ b/features/org.eclipse.jpt.feature.patch/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/features/org.eclipse.jpt.feature.patch/epl-v10.html b/features/org.eclipse.jpt.feature.patch/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jpt.feature.patch/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>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. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jpt.feature.patch/feature.properties b/features/org.eclipse.jpt.feature.patch/feature.properties
index 7ef6062..e56de46 100644
--- a/features/org.eclipse.jpt.feature.patch/feature.properties
+++ b/features/org.eclipse.jpt.feature.patch/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2008 Oracle.
 # 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:
 #     Oracle - initial API and implementation
@@ -25,9 +27,9 @@
 copyright=\
 Copyright (c) 2006-08 Oracle Corporation.\n\
 All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
+http://www.eclipse.org/legal/epl-2.0/\n\
 \n\
 Contributors:\n\
     Oracle - initial API and implementation\n
@@ -61,8 +63,8 @@
 \n\
 Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
 is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+License Version 2.0 ("EPL"). A copy of the EPL is provided with this\n\
+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/features/org.eclipse.jpt.feature.patch/feature.xml b/features/org.eclipse.jpt.feature.patch/feature.xml
index 62fe3a8..9b96e8e 100644
--- a/features/org.eclipse.jpt.feature.patch/feature.xml
+++ b/features/org.eclipse.jpt.feature.patch/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2008, 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
+ -->
+
 <feature
       id="org.eclipse.jpt.feature.patch"
       label="%featureName"
diff --git a/features/org.eclipse.jpt.feature.patch/license.html b/features/org.eclipse.jpt.feature.patch/license.html
index 2347060..224d07f 100644
--- a/features/org.eclipse.jpt.feature.patch/license.html
+++ b/features/org.eclipse.jpt.feature.patch/license.html
@@ -20,9 +20,9 @@
 <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 ("EPL"). A copy of the EPL is provided with this 
+Public License Version 2.0 ("EPL"). 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>. 
+href="http://www.eclipse.org/legal/epl-2.0/">http://www.eclipse.org/legal/epl-2.0/</A>. 
 For purposes of the EPL, "Program" 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.org CVS repository 
diff --git a/features/org.eclipse.jpt.feature.patch/pom.xml b/features/org.eclipse.jpt.feature.patch/pom.xml
index 9172e7b..6b956dc 100644
--- a/features/org.eclipse.jpt.feature.patch/pom.xml
+++ b/features/org.eclipse.jpt.feature.patch/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/features/org.eclipse.jpt.jpa.feature.patch/build.properties b/features/org.eclipse.jpt.jpa.feature.patch/build.properties
index cb50260..a6d70b8 100644
--- a/features/org.eclipse.jpt.jpa.feature.patch/build.properties
+++ b/features/org.eclipse.jpt.jpa.feature.patch/build.properties
@@ -1,5 +1,17 @@
+###############################################################################
+# Copyright (c) 2012, 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 = feature.xml,\
                license.html,\
                feature.properties,\
-               epl-v10.html,\
+               epl-2.0.html,\
                eclipse_update_120.jpg
diff --git a/features/org.eclipse.jpt.jpa.feature.patch/epl-2.0.html b/features/org.eclipse.jpt.jpa.feature.patch/epl-2.0.html
new file mode 100644
index 0000000..626fd4a
--- /dev/null
+++ b/features/org.eclipse.jpt.jpa.feature.patch/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 intellectua