Fix license text (1.0 -> 2.0) via patch contributed by Sudip Mukherjee <sudipm.mukherjee@gmail.com>

Signed-off-by: nickboldt <nboldt@redhat.com>
diff --git a/docs/org.eclipse.wst.common.api.doc/about.html b/docs/org.eclipse.wst.common.api.doc/about.html
index 8fbbe3c..76ccc58 100644
--- a/docs/org.eclipse.wst.common.api.doc/about.html
+++ b/docs/org.eclipse.wst.common.api.doc/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/docs/org.eclipse.wst.common.api.doc/reference/ext/org_eclipse_wst_common_uriresolver_resolverExtensions.html b/docs/org.eclipse.wst.common.api.doc/reference/ext/org_eclipse_wst_common_uriresolver_resolverExtensions.html
index 499be64..13a0415 100644
--- a/docs/org.eclipse.wst.common.api.doc/reference/ext/org_eclipse_wst_common_uriresolver_resolverExtensions.html
+++ b/docs/org.eclipse.wst.common.api.doc/reference/ext/org_eclipse_wst_common_uriresolver_resolverExtensions.html
@@ -77,7 +77,7 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2008 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at <a
 href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/docs/org.eclipse.wst.validation.doc.isv/about.html b/docs/org.eclipse.wst.validation.doc.isv/about.html
index 8fbbe3c..76ccc58 100644
--- a/docs/org.eclipse.wst.validation.doc.isv/about.html
+++ b/docs/org.eclipse.wst.validation.doc.isv/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_referencialFileValidator.html b/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_referencialFileValidator.html
index f3a3dad..6c9de78 100644
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_referencialFileValidator.html
+++ b/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_referencialFileValidator.html
@@ -42,7 +42,7 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at <a
 href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validationHelper.html b/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validationHelper.html
index 78c5e13..6f82292 100644
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validationHelper.html
+++ b/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validationHelper.html
@@ -36,7 +36,7 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at <a
 href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validationSelectionHandler.html b/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validationSelectionHandler.html
index 428f277..66dc6d3 100644
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validationSelectionHandler.html
+++ b/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validationSelectionHandler.html
@@ -37,7 +37,7 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at <a
 href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validator.html b/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validator.html
index fc1b3b8..ef6db89 100644
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validator.html
+++ b/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validator.html
@@ -333,7 +333,7 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at <a
 href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validatorDelegates.html b/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validatorDelegates.html
index e1d0dc3..63faf9b 100644
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validatorDelegates.html
+++ b/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validatorDelegates.html
@@ -45,7 +45,7 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2006 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at <a
 href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validatorGroup.html b/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validatorGroup.html
index 2ddb5e1..276e518 100644
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validatorGroup.html
+++ b/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validatorGroup.html
@@ -80,7 +80,7 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2008 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at <a
 href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validatorV2.html b/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validatorV2.html
index 62f6479..9a3a62b 100644
--- a/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validatorV2.html
+++ b/docs/org.eclipse.wst.validation.doc.isv/reference/extension-points/vf/org_eclipse_wst_validation_validatorV2.html
@@ -158,7 +158,7 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2007,2008 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at <a
 href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/docs/org.eclipse.wst.validation.infopop/about.html b/docs/org.eclipse.wst.validation.infopop/about.html
index 8fbbe3c..76ccc58 100644
--- a/docs/org.eclipse.wst.validation.infopop/about.html
+++ b/docs/org.eclipse.wst.validation.infopop/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/features/org.eclipse.jst.common.fproj.enablement.jdt.feature/feature.properties b/features/org.eclipse.jst.common.fproj.enablement.jdt.feature/feature.properties
index b212823..d2aa11a 100644
--- a/features/org.eclipse.jst.common.fproj.enablement.jdt.feature/feature.properties
+++ b/features/org.eclipse.jst.common.fproj.enablement.jdt.feature/feature.properties
@@ -14,7 +14,7 @@
 copyright=\
 Copyright (c) 2009 Oracle 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 v2.0\n\
 which accompanies this distribution, and is available at\n\
 https://www.eclipse.org/legal/epl-2.0/
 \n
diff --git a/features/org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature/feature.properties b/features/org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature/feature.properties
index 27690c4..b0bd179 100644
--- a/features/org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature/feature.properties
+++ b/features/org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature/feature.properties
@@ -14,7 +14,7 @@
 copyright=\
 Copyright (c) 2009 Oracle 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 v2.0\n\
 which accompanies this distribution, and is available at\n\
 https://www.eclipse.org/legal/epl-2.0/
 \n
diff --git a/features/org.eclipse.wst.common.fproj.feature/feature.properties b/features/org.eclipse.wst.common.fproj.feature/feature.properties
index 10eb89e..c8848f6 100644
--- a/features/org.eclipse.wst.common.fproj.feature/feature.properties
+++ b/features/org.eclipse.wst.common.fproj.feature/feature.properties
@@ -14,7 +14,7 @@
 copyright=\
 Copyright (c) 2009 Oracle 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 v2.0\n\
 which accompanies this distribution, and is available at\n\
 https://www.eclipse.org/legal/epl-2.0/
 \n
diff --git a/features/org.eclipse.wst.common.fproj.sdk.feature/feature.properties b/features/org.eclipse.wst.common.fproj.sdk.feature/feature.properties
index 98e9bb0..9e0afaf 100644
--- a/features/org.eclipse.wst.common.fproj.sdk.feature/feature.properties
+++ b/features/org.eclipse.wst.common.fproj.sdk.feature/feature.properties
@@ -14,7 +14,7 @@
 copyright=\
 Copyright (c) 2009 Oracle 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 v2.0\n\
 which accompanies this distribution, and is available at\n\
 https://www.eclipse.org/legal/epl-2.0/
 \n
diff --git a/features/org.eclipse.wst.common_core.feature/feature.properties b/features/org.eclipse.wst.common_core.feature/feature.properties
index f4ae068..3f7d542 100644
--- a/features/org.eclipse.wst.common_core.feature/feature.properties
+++ b/features/org.eclipse.wst.common_core.feature/feature.properties
@@ -28,7 +28,7 @@
 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 v2.0\n\
 which accompanies this distribution, and is available at\n\
 https://www.eclipse.org/legal/epl-2.0/
 \n\
diff --git a/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/feature.properties
index f1851be..79827af 100644
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/feature.properties
@@ -27,7 +27,7 @@
 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 v2.0\n\
 which accompanies this distribution, and is available at\n\
 https://www.eclipse.org/legal/epl-2.0/
 \n\
diff --git a/features/org.eclipse.wst.common_sdk.feature/feature.properties b/features/org.eclipse.wst.common_sdk.feature/feature.properties
index 18bd8b2..fee95bd 100644
--- a/features/org.eclipse.wst.common_sdk.feature/feature.properties
+++ b/features/org.eclipse.wst.common_sdk.feature/feature.properties
@@ -28,7 +28,7 @@
 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 v2.0\n\
 which accompanies this distribution, and is available at\n\
 https://www.eclipse.org/legal/epl-2.0/
 \n\
diff --git a/features/org.eclipse.wst.common_tests.feature/feature.properties b/features/org.eclipse.wst.common_tests.feature/feature.properties
index 42173ba..5f99812 100644
--- a/features/org.eclipse.wst.common_tests.feature/feature.properties
+++ b/features/org.eclipse.wst.common_tests.feature/feature.properties
@@ -28,7 +28,7 @@
 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 v2.0\n\
 which accompanies this distribution, and is available at\n\
 https://www.eclipse.org/legal/epl-2.0/
 \n\
diff --git a/features/org.eclipse.wst.common_ui.feature/feature.properties b/features/org.eclipse.wst.common_ui.feature/feature.properties
index 334b095..e4e0bd8 100644
--- a/features/org.eclipse.wst.common_ui.feature/feature.properties
+++ b/features/org.eclipse.wst.common_ui.feature/feature.properties
@@ -28,7 +28,7 @@
 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 v2.0\n\
 which accompanies this distribution, and is available at\n\
 https://www.eclipse.org/legal/epl-2.0/
 \n\
diff --git a/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/feature.properties
index c1652d3..184ad31 100644
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/feature.properties
@@ -29,7 +29,7 @@
 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 v2.0\n\
 which accompanies this distribution, and is available at\n\
 https://www.eclipse.org/legal/epl-2.0/
 \n\
diff --git a/plugins/org.eclipse.jem.util/about.html b/plugins/org.eclipse.jem.util/about.html
index a36f6b1..fe7576b 100644
--- a/plugins/org.eclipse.jem.util/about.html
+++ b/plugins/org.eclipse.jem.util/about.html
@@ -11,7 +11,7 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+Eclipse Public License v2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
 at <a href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
 </a>.
diff --git a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/about.html b/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/about.html
index e35c865..75e7337 100644
--- a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/about.html
+++ b/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/about.html
@@ -10,7 +10,7 @@
 <p>30th March, 2004</p>	
 <h3>License</h3>
 <p>Eclipse.org makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="https://www.eclipse.org/legal/epl-2.0/
+Eclipse Public License v2.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
 </a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
diff --git a/plugins/org.eclipse.jem.util/schema/uiTester.exsd b/plugins/org.eclipse.jem.util/schema/uiTester.exsd
index 1c7c8de..2df0310 100644
--- a/plugins/org.eclipse.jem.util/schema/uiTester.exsd
+++ b/plugins/org.eclipse.jem.util/schema/uiTester.exsd
@@ -119,7 +119,7 @@
       <documentation>
          Copyright (c) 2004, 2006 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at 
 &lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.jst.common.fproj.enablement.jdt.sdk/about.html b/plugins/org.eclipse.jst.common.fproj.enablement.jdt.sdk/about.html
index 8fbbe3c..76ccc58 100644
--- a/plugins/org.eclipse.jst.common.fproj.enablement.jdt.sdk/about.html
+++ b/plugins/org.eclipse.jst.common.fproj.enablement.jdt.sdk/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.jst.common.project.facet.core/about.html b/plugins/org.eclipse.jst.common.project.facet.core/about.html
index 8fbbe3c..76ccc58 100644
--- a/plugins/org.eclipse.jst.common.project.facet.core/about.html
+++ b/plugins/org.eclipse.jst.common.project.facet.core/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.jst.common.project.facet.core/schemas/downloadableLibraries.exsd b/plugins/org.eclipse.jst.common.project.facet.core/schemas/downloadableLibraries.exsd
index ffd770a..3f1fff9 100644
--- a/plugins/org.eclipse.jst.common.project.facet.core/schemas/downloadableLibraries.exsd
+++ b/plugins/org.eclipse.jst.common.project.facet.core/schemas/downloadableLibraries.exsd
@@ -140,7 +140,7 @@
       <documentation>
          Copyright (c) 2010 Oracle and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.jst.common.project.facet.core/schemas/legacyLibraryProviderDetectors.exsd b/plugins/org.eclipse.jst.common.project.facet.core/schemas/legacyLibraryProviderDetectors.exsd
index 5c65835..fd1ab52 100644
--- a/plugins/org.eclipse.jst.common.project.facet.core/schemas/legacyLibraryProviderDetectors.exsd
+++ b/plugins/org.eclipse.jst.common.project.facet.core/schemas/legacyLibraryProviderDetectors.exsd
@@ -105,7 +105,7 @@
       <documentation>
          Copyright (c) 2010 Oracle and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.jst.common.project.facet.core/schemas/libraryProviders.exsd b/plugins/org.eclipse.jst.common.project.facet.core/schemas/libraryProviders.exsd
index 3a22f17..9138250 100644
--- a/plugins/org.eclipse.jst.common.project.facet.core/schemas/libraryProviders.exsd
+++ b/plugins/org.eclipse.jst.common.project.facet.core/schemas/libraryProviders.exsd
@@ -236,7 +236,7 @@
       <documentation>
          Copyright (c) 2010 Oracle and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.jst.common.project.facet.ui/about.html b/plugins/org.eclipse.jst.common.project.facet.ui/about.html
index 9011dc5..48c79d8 100644
--- a/plugins/org.eclipse.jst.common.project.facet.ui/about.html
+++ b/plugins/org.eclipse.jst.common.project.facet.ui/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.jst.common.project.facet.ui/schemas/libraryProviderActionPanels.exsd b/plugins/org.eclipse.jst.common.project.facet.ui/schemas/libraryProviderActionPanels.exsd
index 8841c42..a343ac4 100644
--- a/plugins/org.eclipse.jst.common.project.facet.ui/schemas/libraryProviderActionPanels.exsd
+++ b/plugins/org.eclipse.jst.common.project.facet.ui/schemas/libraryProviderActionPanels.exsd
@@ -115,7 +115,7 @@
       <documentation>
          Copyright (c) 2010 Oracle and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.core/about.html b/plugins/org.eclipse.wst.common.core/about.html
index 8fbbe3c..76ccc58 100644
--- a/plugins/org.eclipse.wst.common.core/about.html
+++ b/plugins/org.eclipse.wst.common.core/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.core/schema/uiTester.exsd b/plugins/org.eclipse.wst.common.core/schema/uiTester.exsd
index 52ab4fa..b3a8acd 100644
--- a/plugins/org.eclipse.wst.common.core/schema/uiTester.exsd
+++ b/plugins/org.eclipse.wst.common.core/schema/uiTester.exsd
@@ -124,7 +124,7 @@
       <documentation>
          Copyright (c) 2004, 2006 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at 
 &lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.emf/about.html b/plugins/org.eclipse.wst.common.emf/about.html
index 8fbbe3c..76ccc58 100644
--- a/plugins/org.eclipse.wst.common.emf/about.html
+++ b/plugins/org.eclipse.wst.common.emf/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.emf/schema/packageURIMap.exsd b/plugins/org.eclipse.wst.common.emf/schema/packageURIMap.exsd
index 338d3ad..ed09a0e 100644
--- a/plugins/org.eclipse.wst.common.emf/schema/packageURIMap.exsd
+++ b/plugins/org.eclipse.wst.common.emf/schema/packageURIMap.exsd
@@ -104,7 +104,7 @@
       <documentation>
          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.emf/schema/translatorExtension.exsd b/plugins/org.eclipse.wst.common.emf/schema/translatorExtension.exsd
index 4b860ca..2513fa7 100644
--- a/plugins/org.eclipse.wst.common.emf/schema/translatorExtension.exsd
+++ b/plugins/org.eclipse.wst.common.emf/schema/translatorExtension.exsd
@@ -96,7 +96,7 @@
       </appInfo>
       <documentation>
          Copyright (c) 2005 IBM Corporation and others.
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
+All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
 
       </documentation>
    </annotation>
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AttributeTranslatorFilter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AttributeTranslatorFilter.java
index beed8ed..79d5071 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AttributeTranslatorFilter.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AttributeTranslatorFilter.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityURIConverter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityURIConverter.java
index 2ee2611..cd5a6c7 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityURIConverter.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityURIConverter.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResource.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResource.java
index 5709877..0e912a0 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResource.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResource.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMISaveImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMISaveImpl.java
index b792d94..e4b4cf1 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMISaveImpl.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMISaveImpl.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMAdapter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMAdapter.java
index 3a2d0f3..8909496 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMAdapter.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMAdapter.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRendererFactory.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRendererFactory.java
index c03064c..0405bc9 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRendererFactory.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRendererFactory.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/LinkUpdaterTarget.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/LinkUpdaterTarget.java
index ae49baf..cf5c6c1 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/LinkUpdaterTarget.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/LinkUpdaterTarget.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ObjectTranslatorFilter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ObjectTranslatorFilter.java
index fbb84f8..ce54e94 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ObjectTranslatorFilter.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ObjectTranslatorFilter.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIFactoryImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIFactoryImpl.java
index cc35d1a..cd13640 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIFactoryImpl.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIFactoryImpl.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RendererFactory.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RendererFactory.java
index 2da17e9..24dd5a4 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RendererFactory.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RendererFactory.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorFilter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorFilter.java
index e0041c5..6266315 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorFilter.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorFilter.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorPath.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorPath.java
index 223734f..a7bcaa2 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorPath.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorPath.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResource.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResource.java
index 680b97d..599bbae 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResource.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResource.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceFactory.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceFactory.java
index ac91f05..860db43 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceFactory.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceFactory.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ArrayUtil.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ArrayUtil.java
index 6cd10a5..f4a7513 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ArrayUtil.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ArrayUtil.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/FeatureValueConversionException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/FeatureValueConversionException.java
index 7a16166..7affee1 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/FeatureValueConversionException.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/FeatureValueConversionException.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordCipherException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordCipherException.java
index 84adedb..6de2837 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordCipherException.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordCipherException.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordDecodingException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordDecodingException.java
index 4091701..1be4282 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordDecodingException.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordDecodingException.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordEncodingException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordEncodingException.java
index 3f2ff6a..3479fc9 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordEncodingException.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordEncodingException.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IsLoadingDetector.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IsLoadingDetector.java
index 5f5d4af..64ddb55 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IsLoadingDetector.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IsLoadingDetector.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Namespace.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Namespace.java
index 0926318..d1ef27e 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Namespace.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Namespace.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordCipherUtil.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordCipherUtil.java
index 2082448..71d97fd 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordCipherUtil.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordCipherUtil.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordEncoderDecoder.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordEncoderDecoder.java
index cd8b644..63fc750 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordEncoderDecoder.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordEncoderDecoder.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordUtil.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordUtil.java
index 51a0f0c..7e498b3 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordUtil.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordUtil.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceDependencyRegister.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceDependencyRegister.java
index 29b0187..5626abc 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceDependencyRegister.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceDependencyRegister.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Revisit.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Revisit.java
index 0fd06fa..e983c49 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Revisit.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Revisit.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/TranslatorManager.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/TranslatorManager.java
index d4cd0ec..0bf6ebf 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/TranslatorManager.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/TranslatorManager.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2006 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/TranslatorService.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/TranslatorService.java
index 1b05539..4c37668 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/TranslatorService.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/TranslatorService.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2006 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/UnsupportedCryptoAlgorithmException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/UnsupportedCryptoAlgorithmException.java
index de3c0ca..57e666a 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/UnsupportedCryptoAlgorithmException.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/UnsupportedCryptoAlgorithmException.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/about.html b/plugins/org.eclipse.wst.common.emfworkbench.integration/about.html
index 8fbbe3c..76ccc58 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/about.html
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/adapterFactory.exsd b/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/adapterFactory.exsd
index edab7c4..6197cd8 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/adapterFactory.exsd
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/adapterFactory.exsd
@@ -135,7 +135,7 @@
       <documentation>

          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;

 All rights reserved. This program and the accompanying materials are made 

-available under the terms of the Eclipse Public License v1.0 which accompanies 

+available under the terms of the Eclipse Public License v2.0 which accompanies 

 this distribution, and is available at &lt;a

 href=&quot;https://www.eclipse.org/legal/epl-2.0/

 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/

diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/editModel.exsd b/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/editModel.exsd
index f174fd9..0dfa675 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/editModel.exsd
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/editModel.exsd
@@ -189,7 +189,7 @@
       <documentation>

          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;

 All rights reserved. This program and the accompanying materials are made 

-available under the terms of the Eclipse Public License v1.0 which accompanies 

+available under the terms of the Eclipse Public License v2.0 which accompanies 

 this distribution, and is available at &lt;a

 href=&quot;https://www.eclipse.org/legal/epl-2.0/

 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/

diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/editModelExtension.exsd b/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/editModelExtension.exsd
index 1652212..c5c31fb 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/editModelExtension.exsd
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/editModelExtension.exsd
@@ -121,7 +121,7 @@
       <documentation>

          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;

 All rights reserved. This program and the accompanying materials are made 

-available under the terms of the Eclipse Public License v1.0 which accompanies 

+available under the terms of the Eclipse Public License v2.0 which accompanies 

 this distribution, and is available at &lt;a

 href=&quot;https://www.eclipse.org/legal/epl-2.0/

 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/

diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/modifierHelperFactory.exsd b/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/modifierHelperFactory.exsd
index 9373a0d..942ae9a 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/modifierHelperFactory.exsd
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/modifierHelperFactory.exsd
@@ -151,7 +151,7 @@
       <documentation>

          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;

 All rights reserved. This program and the accompanying materials are made 

-available under the terms of the Eclipse Public License v1.0 which accompanies 

+available under the terms of the Eclipse Public License v2.0 which accompanies 

 this distribution, and is available at &lt;a

 href=&quot;https://www.eclipse.org/legal/epl-2.0/

 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/

diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelResource.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelResource.java
index 45d8503..21dda0f 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelResource.java
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelResource.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelRetriever.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelRetriever.java
index af2fd59..a1a8203 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelRetriever.java
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelRetriever.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/AbstractEditModelCommand.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/AbstractEditModelCommand.java
index 532a875..acd51a0 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/AbstractEditModelCommand.java
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/AbstractEditModelCommand.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModelEvent.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModelEvent.java
index de742f7..a5b23f4 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModelEvent.java
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModelEvent.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/ResourceStateInputProvider.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/ResourceStateInputProvider.java
index 211ae5f..feb7c9f 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/ResourceStateInputProvider.java
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/ResourceStateInputProvider.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/ResourceStateValidatorPresenter.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/ResourceStateValidatorPresenter.java
index 79e635c..dc248aa 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/ResourceStateValidatorPresenter.java
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/ResourceStateValidatorPresenter.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.environment/about.html b/plugins/org.eclipse.wst.common.environment/about.html
index 8fbbe3c..76ccc58 100644
--- a/plugins/org.eclipse.wst.common.environment/about.html
+++ b/plugins/org.eclipse.wst.common.environment/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/EnvironmentService.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/EnvironmentService.java
index 7e69493..9c76fff 100644
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/EnvironmentService.java
+++ b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/EnvironmentService.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/Messages.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/Messages.java
index d0b817f..a021d4b 100644
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/Messages.java
+++ b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/Messages.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.fproj.sdk/about.html b/plugins/org.eclipse.wst.common.fproj.sdk/about.html
index 8fbbe3c..76ccc58 100644
--- a/plugins/org.eclipse.wst.common.fproj.sdk/about.html
+++ b/plugins/org.eclipse.wst.common.fproj.sdk/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/about.html b/plugins/org.eclipse.wst.common.frameworks.ui/about.html
index 8fbbe3c..76ccc58 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/about.html
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/schema/DataModelWizardExtension.exsd b/plugins/org.eclipse.wst.common.frameworks.ui/schema/DataModelWizardExtension.exsd
index afa34e1..9d7b9c0 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/schema/DataModelWizardExtension.exsd
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/schema/DataModelWizardExtension.exsd
@@ -104,7 +104,7 @@
       <documentation>
          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendableWizard.exsd b/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendableWizard.exsd
index caa75aa..a532b4f 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendableWizard.exsd
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendableWizard.exsd
@@ -94,7 +94,7 @@
       <documentation>

          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;

 All rights reserved. This program and the accompanying materials are made 

-available under the terms of the Eclipse Public License v1.0 which accompanies 

+available under the terms of the Eclipse Public License v2.0 which accompanies 

 this distribution, and is available at &lt;a

 href=&quot;https://www.eclipse.org/legal/epl-2.0/

 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/

diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendableWizardPage.exsd b/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendableWizardPage.exsd
index c78a144..ebf0f8f 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendableWizardPage.exsd
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendableWizardPage.exsd
@@ -125,7 +125,7 @@
       <documentation>

          Copyright (c) 2005, 2008 IBM Corporation and others.&lt;br&gt;

 All rights reserved. This program and the accompanying materials are made 

-available under the terms of the Eclipse Public License v1.0 which accompanies 

+available under the terms of the Eclipse Public License v2.0 which accompanies 

 this distribution, and is available at &lt;a

 href=&quot;https://www.eclipse.org/legal/epl-2.0/

 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/

diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendedViewer.exsd b/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendedViewer.exsd
index c7d3c65..9bcc674 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendedViewer.exsd
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendedViewer.exsd
@@ -129,7 +129,7 @@
       <documentation>

          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;

 All rights reserved. This program and the accompanying materials are made 

-available under the terms of the Eclipse Public License v1.0 which accompanies 

+available under the terms of the Eclipse Public License v2.0 which accompanies 

 this distribution, and is available at &lt;a

 href=&quot;https://www.eclipse.org/legal/epl-2.0/

 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/

diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/schema/menuEnabler.exsd b/plugins/org.eclipse.wst.common.frameworks.ui/schema/menuEnabler.exsd
index e0b04c4..c32efb5 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/schema/menuEnabler.exsd
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/schema/menuEnabler.exsd
@@ -94,7 +94,7 @@
       <documentation>
          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 v2.0
   which accompanies this distribution, and is available at
   https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/schema/wtpuiAction.exsd b/plugins/org.eclipse.wst.common.frameworks.ui/schema/wtpuiAction.exsd
index aae1964..ed01963 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/schema/wtpuiAction.exsd
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/schema/wtpuiAction.exsd
@@ -358,7 +358,7 @@
       <documentation>

          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;

 All rights reserved. This program and the accompanying materials are made 

-available under the terms of the Eclipse Public License v1.0 which accompanies 

+available under the terms of the Eclipse Public License v2.0 which accompanies 

 this distribution, and is available at &lt;a

 href=&quot;https://www.eclipse.org/legal/epl-2.0/

 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/

diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/AddablePageGroup.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/AddablePageGroup.java
index 8a98d5a..9587170 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/AddablePageGroup.java
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/AddablePageGroup.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/SimplePageGroup.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/SimplePageGroup.java
index 204f0f6..44f4842 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/SimplePageGroup.java
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/SimplePageGroup.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ExecutionListener.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ExecutionListener.java
index a73a6a9..335e058 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ExecutionListener.java
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ExecutionListener.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/InternalCommonWorkbenchMessages.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/InternalCommonWorkbenchMessages.java
index d70ebe3..9dee34c 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/InternalCommonWorkbenchMessages.java
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/InternalCommonWorkbenchMessages.java
@@ -1,7 +1,7 @@
 /**********************************************************************
  * 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 which accompanies this distribution, and is
+ * the Eclipse Public License v2.0 which accompanies this distribution, and is
  * available at https://www.eclipse.org/legal/epl-2.0/
 
  * 
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/SimplePageGroupHandler.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/SimplePageGroupHandler.java
index 02c2c60..9319683 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/SimplePageGroupHandler.java
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/SimplePageGroupHandler.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/SimplePageHandler.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/SimplePageHandler.java
index 5945b0e..103ca35 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/SimplePageHandler.java
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/SimplePageHandler.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.frameworks/about.html b/plugins/org.eclipse.wst.common.frameworks/about.html
index 8fbbe3c..76ccc58 100644
--- a/plugins/org.eclipse.wst.common.frameworks/about.html
+++ b/plugins/org.eclipse.wst.common.frameworks/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.frameworks/schema/DataModelProviderExtension.exsd b/plugins/org.eclipse.wst.common.frameworks/schema/DataModelProviderExtension.exsd
index 705d01d..8260d66 100644
--- a/plugins/org.eclipse.wst.common.frameworks/schema/DataModelProviderExtension.exsd
+++ b/plugins/org.eclipse.wst.common.frameworks/schema/DataModelProviderExtension.exsd
@@ -144,7 +144,7 @@
       <documentation>
          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.frameworks/schema/OperationExtension.exsd b/plugins/org.eclipse.wst.common.frameworks/schema/OperationExtension.exsd
index 9ed1a53..ba54a6e 100644
--- a/plugins/org.eclipse.wst.common.frameworks/schema/OperationExtension.exsd
+++ b/plugins/org.eclipse.wst.common.frameworks/schema/OperationExtension.exsd
@@ -110,7 +110,7 @@
       <documentation>

          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;

 All rights reserved. This program and the accompanying materials are made 

-available under the terms of the Eclipse Public License v1.0 which accompanies 

+available under the terms of the Eclipse Public License v2.0 which accompanies 

 this distribution, and is available at &lt;a

 href=&quot;https://www.eclipse.org/legal/epl-2.0/

 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/

diff --git a/plugins/org.eclipse.wst.common.frameworks/schema/WTPActivityBridgeHelper.exsd b/plugins/org.eclipse.wst.common.frameworks/schema/WTPActivityBridgeHelper.exsd
index 57b1f1c..515420a 100644
--- a/plugins/org.eclipse.wst.common.frameworks/schema/WTPActivityBridgeHelper.exsd
+++ b/plugins/org.eclipse.wst.common.frameworks/schema/WTPActivityBridgeHelper.exsd
@@ -94,7 +94,7 @@
       <documentation>

          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;

 All rights reserved. This program and the accompanying materials are made 

-available under the terms of the Eclipse Public License v1.0 which accompanies 

+available under the terms of the Eclipse Public License v2.0 which accompanies 

 this distribution, and is available at &lt;a

 href=&quot;https://www.eclipse.org/legal/epl-2.0/

 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/

diff --git a/plugins/org.eclipse.wst.common.frameworks/schema/functionGroup.exsd b/plugins/org.eclipse.wst.common.frameworks/schema/functionGroup.exsd
index 9160f92..6b130e8 100644
--- a/plugins/org.eclipse.wst.common.frameworks/schema/functionGroup.exsd
+++ b/plugins/org.eclipse.wst.common.frameworks/schema/functionGroup.exsd
@@ -177,7 +177,7 @@
       <documentation>

          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;

 All rights reserved. This program and the accompanying materials are made 

-available under the terms of the Eclipse Public License v1.0 which accompanies 

+available under the terms of the Eclipse Public License v2.0 which accompanies 

 this distribution, and is available at &lt;a

 href=&quot;https://www.eclipse.org/legal/epl-2.0/

 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/

diff --git a/plugins/org.eclipse.wst.common.frameworks/src-non_workbench/org/eclipse/wst/common/frameworks/internal/enablement/nonui/WorkbenchUtil.java b/plugins/org.eclipse.wst.common.frameworks/src-non_workbench/org/eclipse/wst/common/frameworks/internal/enablement/nonui/WorkbenchUtil.java
index e75c8d9..04e520e 100644
--- a/plugins/org.eclipse.wst.common.frameworks/src-non_workbench/org/eclipse/wst/common/frameworks/internal/enablement/nonui/WorkbenchUtil.java
+++ b/plugins/org.eclipse.wst.common.frameworks/src-non_workbench/org/eclipse/wst/common/frameworks/internal/enablement/nonui/WorkbenchUtil.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/plugins/org.eclipse.wst.common.infopop/about.html b/plugins/org.eclipse.wst.common.infopop/about.html
index 8fbbe3c..76ccc58 100644
--- a/plugins/org.eclipse.wst.common.infopop/about.html
+++ b/plugins/org.eclipse.wst.common.infopop/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/about.html b/plugins/org.eclipse.wst.common.modulecore.ui/about.html
index 3c942cf..a16e459 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/about.html
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/schema/deploymentAssemblyVerifier.exsd b/plugins/org.eclipse.wst.common.modulecore.ui/schema/deploymentAssemblyVerifier.exsd
index f88a252..ad0a91b 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/schema/deploymentAssemblyVerifier.exsd
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/schema/deploymentAssemblyVerifier.exsd
@@ -106,7 +106,7 @@
       <documentation>
          Copyright (c) 2010 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/schema/resourceMappingFilter.exsd b/plugins/org.eclipse.wst.common.modulecore.ui/schema/resourceMappingFilter.exsd
index 53111de..67853c0 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/schema/resourceMappingFilter.exsd
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/schema/resourceMappingFilter.exsd
@@ -88,7 +88,7 @@
       <documentation>
          Copyright (c) 2010 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.modulecore/about.html b/plugins/org.eclipse.wst.common.modulecore/about.html
index 8fbbe3c..76ccc58 100644
--- a/plugins/org.eclipse.wst.common.modulecore/about.html
+++ b/plugins/org.eclipse.wst.common.modulecore/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/AbstractResourceListVirtualComponent.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/AbstractResourceListVirtualComponent.java
index 93d8905..5dcc946 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/AbstractResourceListVirtualComponent.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/AbstractResourceListVirtualComponent.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2009 Red Hat, Inc. 
  * Distributed under license by Red Hat, Inc. All rights reserved. 
  * This program is made available under the terms of the 
- * Eclipse Public License v1.0 which accompanies this distribution, 
+ * Eclipse Public License v2.0 which accompanies this distribution, 
  * and is available at https://www.eclipse.org/legal/epl-2.0/
  
  * 
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/ResourceListVirtualFolder.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/ResourceListVirtualFolder.java
index 6a6238e..5bb9be8 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/ResourceListVirtualFolder.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/ResourceListVirtualFolder.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2009 Red Hat, Inc. 
  * Distributed under license by Red Hat, Inc. All rights reserved. 
  * This program is made available under the terms of the 
- * Eclipse Public License v1.0 which accompanies this distribution, 
+ * Eclipse Public License v2.0 which accompanies this distribution, 
  * and is available at https://www.eclipse.org/legal/epl-2.0/
  
  * 
diff --git a/plugins/org.eclipse.wst.common.modulecore/schema/ComponentProjectMigrator.exsd b/plugins/org.eclipse.wst.common.modulecore/schema/ComponentProjectMigrator.exsd
index 8131f9d..05cdcee 100644
--- a/plugins/org.eclipse.wst.common.modulecore/schema/ComponentProjectMigrator.exsd
+++ b/plugins/org.eclipse.wst.common.modulecore/schema/ComponentProjectMigrator.exsd
@@ -117,7 +117,7 @@
       <documentation>
          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.modulecore/schema/artifactedit.exsd b/plugins/org.eclipse.wst.common.modulecore/schema/artifactedit.exsd
index 1d07c89..a79e1b6 100644
--- a/plugins/org.eclipse.wst.common.modulecore/schema/artifactedit.exsd
+++ b/plugins/org.eclipse.wst.common.modulecore/schema/artifactedit.exsd
@@ -103,7 +103,7 @@
       <documentation>
          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.project.facet.core/about.html b/plugins/org.eclipse.wst.common.project.facet.core/about.html
index 8fbbe3c..76ccc58 100644
--- a/plugins/org.eclipse.wst.common.project.facet.core/about.html
+++ b/plugins/org.eclipse.wst.common.project.facet.core/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.project.facet.core/schemas/aliases.exsd b/plugins/org.eclipse.wst.common.project.facet.core/schemas/aliases.exsd
index 8640b62..b289171 100644
--- a/plugins/org.eclipse.wst.common.project.facet.core/schemas/aliases.exsd
+++ b/plugins/org.eclipse.wst.common.project.facet.core/schemas/aliases.exsd
@@ -130,7 +130,7 @@
       <documentation>
          Copyright (c) 2010 Oracle and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.project.facet.core/schemas/defaultFacets.exsd b/plugins/org.eclipse.wst.common.project.facet.core/schemas/defaultFacets.exsd
index 4031fb9..95020e3 100644
--- a/plugins/org.eclipse.wst.common.project.facet.core/schemas/defaultFacets.exsd
+++ b/plugins/org.eclipse.wst.common.project.facet.core/schemas/defaultFacets.exsd
@@ -214,7 +214,7 @@
       <documentation>
          Copyright (c) 2010 Oracle and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.project.facet.core/schemas/detectors.exsd b/plugins/org.eclipse.wst.common.project.facet.core/schemas/detectors.exsd
index f008b7e..09ec4e4 100644
--- a/plugins/org.eclipse.wst.common.project.facet.core/schemas/detectors.exsd
+++ b/plugins/org.eclipse.wst.common.project.facet.core/schemas/detectors.exsd
@@ -92,7 +92,7 @@
       <documentation>
          Copyright (c) 2010 Oracle and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.project.facet.core/schemas/facets.exsd b/plugins/org.eclipse.wst.common.project.facet.core/schemas/facets.exsd
index 6f0fc08..b1ab1cd 100644
--- a/plugins/org.eclipse.wst.common.project.facet.core/schemas/facets.exsd
+++ b/plugins/org.eclipse.wst.common.project.facet.core/schemas/facets.exsd
@@ -767,7 +767,7 @@
       <documentation>
          Copyright (c) 2010 Oracle and others.&lt;br&gt;
 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 v2.0
 which accompanies this distribution, and is available at
 &lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.project.facet.core/schemas/groups.exsd b/plugins/org.eclipse.wst.common.project.facet.core/schemas/groups.exsd
index 4a1e8a9..3d4875e 100644
--- a/plugins/org.eclipse.wst.common.project.facet.core/schemas/groups.exsd
+++ b/plugins/org.eclipse.wst.common.project.facet.core/schemas/groups.exsd
@@ -195,7 +195,7 @@
       <documentation>
          Copyright (c) 2010 Oracle and others.&lt;br&gt;
 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 v2.0
 which accompanies this distribution, and is available at
 &lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.project.facet.core/schemas/listeners.exsd b/plugins/org.eclipse.wst.common.project.facet.core/schemas/listeners.exsd
index 4cedf7b..12e5498 100644
--- a/plugins/org.eclipse.wst.common.project.facet.core/schemas/listeners.exsd
+++ b/plugins/org.eclipse.wst.common.project.facet.core/schemas/listeners.exsd
@@ -138,7 +138,7 @@
       <documentation>
          Copyright (c) 2010 Oracle and others.&lt;br&gt;
 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 v2.0
 which accompanies this distribution, and is available at
 &lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.project.facet.core/schemas/presets.exsd b/plugins/org.eclipse.wst.common.project.facet.core/schemas/presets.exsd
index 1b4f02d..76c6487 100644
--- a/plugins/org.eclipse.wst.common.project.facet.core/schemas/presets.exsd
+++ b/plugins/org.eclipse.wst.common.project.facet.core/schemas/presets.exsd
@@ -205,7 +205,7 @@
       <documentation>
          Copyright (c) 2010 Oracle and others.&lt;br&gt;
 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 v2.0
 which accompanies this distribution, and is available at
 &lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.project.facet.core/schemas/runtimeBridges.exsd b/plugins/org.eclipse.wst.common.project.facet.core/schemas/runtimeBridges.exsd
index 9351e55..240ebe3 100644
--- a/plugins/org.eclipse.wst.common.project.facet.core/schemas/runtimeBridges.exsd
+++ b/plugins/org.eclipse.wst.common.project.facet.core/schemas/runtimeBridges.exsd
@@ -114,7 +114,7 @@
       <documentation>
          Copyright (c) 2010 Oracle and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.project.facet.core/schemas/runtimes.exsd b/plugins/org.eclipse.wst.common.project.facet.core/schemas/runtimes.exsd
index e30b4f1..d9ae0fd 100644
--- a/plugins/org.eclipse.wst.common.project.facet.core/schemas/runtimes.exsd
+++ b/plugins/org.eclipse.wst.common.project.facet.core/schemas/runtimes.exsd
@@ -296,7 +296,7 @@
       <documentation>
          Copyright (c) 2010 Oracle and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.project.facet.core/schemas/validators.exsd b/plugins/org.eclipse.wst.common.project.facet.core/schemas/validators.exsd
index 65d66fc..d592af3 100644
--- a/plugins/org.eclipse.wst.common.project.facet.core/schemas/validators.exsd
+++ b/plugins/org.eclipse.wst.common.project.facet.core/schemas/validators.exsd
@@ -137,7 +137,7 @@
       <documentation>
          Copyright (c) 2010 Oracle and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.project.facet.doc.api/about.html b/plugins/org.eclipse.wst.common.project.facet.doc.api/about.html
index 8fbbe3c..76ccc58 100644
--- a/plugins/org.eclipse.wst.common.project.facet.doc.api/about.html
+++ b/plugins/org.eclipse.wst.common.project.facet.doc.api/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.project.facet.ui/about.html b/plugins/org.eclipse.wst.common.project.facet.ui/about.html
index 8fbbe3c..76ccc58 100644
--- a/plugins/org.eclipse.wst.common.project.facet.ui/about.html
+++ b/plugins/org.eclipse.wst.common.project.facet.ui/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.project.facet.ui/schemas/images.exsd b/plugins/org.eclipse.wst.common.project.facet.ui/schemas/images.exsd
index 36714dc..5c56665 100644
--- a/plugins/org.eclipse.wst.common.project.facet.ui/schemas/images.exsd
+++ b/plugins/org.eclipse.wst.common.project.facet.ui/schemas/images.exsd
@@ -125,7 +125,7 @@
       <documentation>
          Copyright (c) 2010 Oracle and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.project.facet.ui/schemas/wizard-pages-old.exsd b/plugins/org.eclipse.wst.common.project.facet.ui/schemas/wizard-pages-old.exsd
index 1e68045..5aaacbf 100644
--- a/plugins/org.eclipse.wst.common.project.facet.ui/schemas/wizard-pages-old.exsd
+++ b/plugins/org.eclipse.wst.common.project.facet.ui/schemas/wizard-pages-old.exsd
@@ -191,7 +191,7 @@
       <documentation>
          Copyright (c) 2010 Oracle and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.project.facet.ui/schemas/wizard-pages.exsd b/plugins/org.eclipse.wst.common.project.facet.ui/schemas/wizard-pages.exsd
index 8d92367..b8a9f1d 100644
--- a/plugins/org.eclipse.wst.common.project.facet.ui/schemas/wizard-pages.exsd
+++ b/plugins/org.eclipse.wst.common.project.facet.ui/schemas/wizard-pages.exsd
@@ -142,7 +142,7 @@
       <documentation>
          Copyright (c) 2010 Oracle and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.ui/about.html b/plugins/org.eclipse.wst.common.ui/about.html
index 8fbbe3c..76ccc58 100644
--- a/plugins/org.eclipse.wst.common.ui/about.html
+++ b/plugins/org.eclipse.wst.common.ui/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.ui/schema/exampleProjectCreationWizard.exsd b/plugins/org.eclipse.wst.common.ui/schema/exampleProjectCreationWizard.exsd
index c1f5338..0e8b99c 100644
--- a/plugins/org.eclipse.wst.common.ui/schema/exampleProjectCreationWizard.exsd
+++ b/plugins/org.eclipse.wst.common.ui/schema/exampleProjectCreationWizard.exsd
@@ -234,7 +234,7 @@
       <documentation>

          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;

 All rights reserved. This program and the accompanying materials are made 

-available under the terms of the Eclipse Public License v1.0 which accompanies 

+available under the terms of the Eclipse Public License v2.0 which accompanies 

 this distribution, and is available at &lt;a

 href=&quot;https://www.eclipse.org/legal/epl-2.0/

 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/

diff --git a/plugins/org.eclipse.wst.common.uriresolver/about.html b/plugins/org.eclipse.wst.common.uriresolver/about.html
index 8fbbe3c..76ccc58 100644
--- a/plugins/org.eclipse.wst.common.uriresolver/about.html
+++ b/plugins/org.eclipse.wst.common.uriresolver/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.common.uriresolver/schema/resolverExtensions.exsd b/plugins/org.eclipse.wst.common.uriresolver/schema/resolverExtensions.exsd
index eaca6ae..e84bf42 100644
--- a/plugins/org.eclipse.wst.common.uriresolver/schema/resolverExtensions.exsd
+++ b/plugins/org.eclipse.wst.common.uriresolver/schema/resolverExtensions.exsd
@@ -158,7 +158,7 @@
       <documentation>
          Copyright (c) 2000, 2008 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.internet.cache/about.html b/plugins/org.eclipse.wst.internet.cache/about.html
index 8fbbe3c..76ccc58 100644
--- a/plugins/org.eclipse.wst.internet.cache/about.html
+++ b/plugins/org.eclipse.wst.internet.cache/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.internet.cache/exsd/cacheresource.exsd b/plugins/org.eclipse.wst.internet.cache/exsd/cacheresource.exsd
index e69cf7e..2d9466a 100644
--- a/plugins/org.eclipse.wst.internet.cache/exsd/cacheresource.exsd
+++ b/plugins/org.eclipse.wst.internet.cache/exsd/cacheresource.exsd
@@ -100,7 +100,7 @@
       <documentation>
          Copyright (c) 2000, 2005 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.validation.ui/about.html b/plugins/org.eclipse.wst.validation.ui/about.html
index 8fbbe3c..76ccc58 100644
--- a/plugins/org.eclipse.wst.validation.ui/about.html
+++ b/plugins/org.eclipse.wst.validation.ui/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.validation/about.html b/plugins/org.eclipse.wst.validation/about.html
index 8fbbe3c..76ccc58 100644
--- a/plugins/org.eclipse.wst.validation/about.html
+++ b/plugins/org.eclipse.wst.validation/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.validation/xsds/referencialFileExtSchema.exsd b/plugins/org.eclipse.wst.validation/xsds/referencialFileExtSchema.exsd
index 99f05a3..f657833 100644
--- a/plugins/org.eclipse.wst.validation/xsds/referencialFileExtSchema.exsd
+++ b/plugins/org.eclipse.wst.validation/xsds/referencialFileExtSchema.exsd
@@ -109,7 +109,7 @@
       <documentation>
          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.validation/xsds/removeV2Validator.exsd b/plugins/org.eclipse.wst.validation/xsds/removeV2Validator.exsd
index 1dba151..4cc2cce 100644
--- a/plugins/org.eclipse.wst.validation/xsds/removeV2Validator.exsd
+++ b/plugins/org.eclipse.wst.validation/xsds/removeV2Validator.exsd
@@ -114,7 +114,7 @@
       <documentation>
          Copyright (c) 2010 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.validation/xsds/validationHelper.exsd b/plugins/org.eclipse.wst.validation/xsds/validationHelper.exsd
index f5c216a..a0760ab 100644
--- a/plugins/org.eclipse.wst.validation/xsds/validationHelper.exsd
+++ b/plugins/org.eclipse.wst.validation/xsds/validationHelper.exsd
@@ -104,7 +104,7 @@
       <documentation>
          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.validation/xsds/validationSelectionHandler.exsd b/plugins/org.eclipse.wst.validation/xsds/validationSelectionHandler.exsd
index ea16667..c9c9f98 100644
--- a/plugins/org.eclipse.wst.validation/xsds/validationSelectionHandler.exsd
+++ b/plugins/org.eclipse.wst.validation/xsds/validationSelectionHandler.exsd
@@ -108,7 +108,7 @@
       <documentation>
          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.validation/xsds/validator.exsd b/plugins/org.eclipse.wst.validation/xsds/validator.exsd
index e62bd49..ba53a5b 100644
--- a/plugins/org.eclipse.wst.validation/xsds/validator.exsd
+++ b/plugins/org.eclipse.wst.validation/xsds/validator.exsd
@@ -439,7 +439,7 @@
       <documentation>
          Copyright (c) 2007,2008 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.validation/xsds/validatorDelegates.exsd b/plugins/org.eclipse.wst.validation/xsds/validatorDelegates.exsd
index 789b793..306fce9 100644
--- a/plugins/org.eclipse.wst.validation/xsds/validatorDelegates.exsd
+++ b/plugins/org.eclipse.wst.validation/xsds/validatorDelegates.exsd
@@ -125,7 +125,7 @@
       <documentation>
          Copyright (c) 2006 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/plugins/org.eclipse.wst.validation/xsds/validatorExtSchema.exsd b/plugins/org.eclipse.wst.validation/xsds/validatorExtSchema.exsd
index c13eacb..a6eda7d 100644
--- a/plugins/org.eclipse.wst.validation/xsds/validatorExtSchema.exsd
+++ b/plugins/org.eclipse.wst.validation/xsds/validatorExtSchema.exsd
@@ -317,7 +317,7 @@
       <documentation>

          Copyright (c) 2005, 2010 IBM Corporation and others.&lt;br&gt;

 All rights reserved. This program and the accompanying materials are made 

-available under the terms of the Eclipse Public License v1.0 which accompanies 

+available under the terms of the Eclipse Public License v2.0 which accompanies 

 this distribution, and is available at &lt;a

 href=&quot;https://www.eclipse.org/legal/epl-2.0/

 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/

diff --git a/plugins/org.eclipse.wst.validation/xsds/validatorgroup.exsd b/plugins/org.eclipse.wst.validation/xsds/validatorgroup.exsd
index a7ad3d6..9e92c5e 100644
--- a/plugins/org.eclipse.wst.validation/xsds/validatorgroup.exsd
+++ b/plugins/org.eclipse.wst.validation/xsds/validatorgroup.exsd
@@ -152,7 +152,7 @@
       <documentation>
          Copyright (c) 2008 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
diff --git a/tests/org.eclipse.wst.common.project.facet.core.tests/about.html b/tests/org.eclipse.wst.common.project.facet.core.tests/about.html
index 89fdb7e..075a8e4 100644
--- a/tests/org.eclipse.wst.common.project.facet.core.tests/about.html
+++ b/tests/org.eclipse.wst.common.project.facet.core.tests/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/tests/org.eclipse.wst.common.project.facet.ui.tests/about.html b/tests/org.eclipse.wst.common.project.facet.ui.tests/about.html
index 89fdb7e..075a8e4 100644
--- a/tests/org.eclipse.wst.common.project.facet.ui.tests/about.html
+++ b/tests/org.eclipse.wst.common.project.facet.ui.tests/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/tests/org.eclipse.wst.common.tests.collector/about.html b/tests/org.eclipse.wst.common.tests.collector/about.html
index 8fbbe3c..76ccc58 100644
--- a/tests/org.eclipse.wst.common.tests.collector/about.html
+++ b/tests/org.eclipse.wst.common.tests.collector/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/tests/org.eclipse.wst.common.tests.ui/about.html b/tests/org.eclipse.wst.common.tests.ui/about.html
index 8fbbe3c..76ccc58 100644
--- a/tests/org.eclipse.wst.common.tests.ui/about.html
+++ b/tests/org.eclipse.wst.common.tests.ui/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestExtendedProvider.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestExtendedProvider.java
index c2292ae..7290c1c 100644
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestExtendedProvider.java
+++ b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestExtendedProvider.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestGroupManager.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestGroupManager.java
index a3561eb..c93e0d2 100644
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestGroupManager.java
+++ b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestGroupManager.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestProvider1.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestProvider1.java
index c05ebe0..5bc0fa1 100644
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestProvider1.java
+++ b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestProvider1.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestProvider2.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestProvider2.java
index 368d282..5b15807 100644
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestProvider2.java
+++ b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestProvider2.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestDataModelProvider.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestDataModelProvider.java
index 776ec04..ac4d78a 100644
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestDataModelProvider.java
+++ b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestDataModelProvider.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestDataWizard.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestDataWizard.java
index a537b0e..00bf3ea 100644
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestDataWizard.java
+++ b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestDataWizard.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestOperation.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestOperation.java
index fa3fb76..c2a0234 100644
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestOperation.java
+++ b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestOperation.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPage1.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPage1.java
index 3877e4b..0fb4b09 100644
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPage1.java
+++ b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPage1.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPage2.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPage2.java
index 42b0dc3..e73838f 100644
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPage2.java
+++ b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPage2.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPageGroup2.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPageGroup2.java
index 2a2a5b3..a4d63eb 100644
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPageGroup2.java
+++ b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPageGroup2.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestRootPageGroup.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestRootPageGroup.java
index ea0f3a1..467161a 100644
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestRootPageGroup.java
+++ b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestRootPageGroup.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestWizardTestcase.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestWizardTestcase.java
index 1c89088..e136995 100644
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestWizardTestcase.java
+++ b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestWizardTestcase.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/tests/org.eclipse.wst.common.tests.validation.guard/about.html b/tests/org.eclipse.wst.common.tests.validation.guard/about.html
index 8fbbe3c..76ccc58 100644
--- a/tests/org.eclipse.wst.common.tests.validation.guard/about.html
+++ b/tests/org.eclipse.wst.common.tests.validation.guard/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/tests/org.eclipse.wst.common.tests.validation/about.html b/tests/org.eclipse.wst.common.tests.validation/about.html
index 8fbbe3c..76ccc58 100644
--- a/tests/org.eclipse.wst.common.tests.validation/about.html
+++ b/tests/org.eclipse.wst.common.tests.validation/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/tests/org.eclipse.wst.common.tests/about.html b/tests/org.eclipse.wst.common.tests/about.html
index 8fbbe3c..76ccc58 100644
--- a/tests/org.eclipse.wst.common.tests/about.html
+++ b/tests/org.eclipse.wst.common.tests/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/environment/tests/EclipseSchemeTests.java b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/environment/tests/EclipseSchemeTests.java
index 01c7e4f..3c08ded 100644
--- a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/environment/tests/EclipseSchemeTests.java
+++ b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/environment/tests/EclipseSchemeTests.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/environment/tests/EnvironmentTests.java b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/environment/tests/EnvironmentTests.java
index 1530350..85cdd26 100644
--- a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/environment/tests/EnvironmentTests.java
+++ b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/environment/tests/EnvironmentTests.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/environment/tests/FileSchemeTests.java b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/environment/tests/FileSchemeTests.java
index d3bb197..6a4c6b8 100644
--- a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/environment/tests/FileSchemeTests.java
+++ b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/environment/tests/FileSchemeTests.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/environment/tests/LoggerTests.java b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/environment/tests/LoggerTests.java
index 80b025d..34969e8 100644
--- a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/environment/tests/LoggerTests.java
+++ b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/environment/tests/LoggerTests.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/environment/tests/StatusHandlerTests.java b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/environment/tests/StatusHandlerTests.java
index 00fa25d..3923665 100644
--- a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/environment/tests/StatusHandlerTests.java
+++ b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/environment/tests/StatusHandlerTests.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/tests/ModuleCoreAPIFVTTest.java b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/tests/ModuleCoreAPIFVTTest.java
index 31c6317..eaf0fdb 100644
--- a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/tests/ModuleCoreAPIFVTTest.java
+++ b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/tests/ModuleCoreAPIFVTTest.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
diff --git a/tests/org.eclipse.wst.common.uriresolver.tests/about.html b/tests/org.eclipse.wst.common.uriresolver.tests/about.html
index 8fbbe3c..76ccc58 100644
--- a/tests/org.eclipse.wst.common.uriresolver.tests/about.html
+++ b/tests/org.eclipse.wst.common.uriresolver.tests/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
diff --git a/tests/org.eclipse.wst.internet.cache.tests/about.html b/tests/org.eclipse.wst.internet.cache.tests/about.html
index 8fbbe3c..76ccc58 100644
--- a/tests/org.eclipse.wst.internet.cache.tests/about.html
+++ b/tests/org.eclipse.wst.internet.cache.tests/about.html
@@ -16,7 +16,7 @@
 
 <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 v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/