diff --git a/docs/org.eclipse.wst.common.api.doc/about.html b/docs/org.eclipse.wst.common.api.doc/about.html
index 2199df3..8fbbe3c 100644
--- a/docs/org.eclipse.wst.common.api.doc/about.html
+++ b/docs/org.eclipse.wst.common.api.doc/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/docs/org.eclipse.wst.common.api.doc/plugin.properties b/docs/org.eclipse.wst.common.api.doc/plugin.properties
index 13d7183..f5b60d2 100644
--- a/docs/org.eclipse.wst.common.api.doc/plugin.properties
+++ b/docs/org.eclipse.wst.common.api.doc/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
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 a8951b1..499be64 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
@@ -79,7 +79,9 @@
 All rights reserved. This program and the accompanying materials are made 
 available under the terms of the Eclipse Public License v1.0 which accompanies 
 this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/about.html b/docs/org.eclipse.wst.validation.doc.isv/about.html
index 2199df3..8fbbe3c 100644
--- a/docs/org.eclipse.wst.validation.doc.isv/about.html
+++ b/docs/org.eclipse.wst.validation.doc.isv/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/docs/org.eclipse.wst.validation.doc.isv/buildExtDocs.properties b/docs/org.eclipse.wst.validation.doc.isv/buildExtDocs.properties
index 1a7455d..3c58c12 100644
--- a/docs/org.eclipse.wst.validation.doc.isv/buildExtDocs.properties
+++ b/docs/org.eclipse.wst.validation.doc.isv/buildExtDocs.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.wst.validation.doc.isv/javadoc.properties b/docs/org.eclipse.wst.validation.doc.isv/javadoc.properties
index 316b8bb..1272f39 100644
--- a/docs/org.eclipse.wst.validation.doc.isv/javadoc.properties
+++ b/docs/org.eclipse.wst.validation.doc.isv/javadoc.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.wst.validation.doc.isv/plugin.properties b/docs/org.eclipse.wst.validation.doc.isv/plugin.properties
index 94b985b..e779f71 100644
--- a/docs/org.eclipse.wst.validation.doc.isv/plugin.properties
+++ b/docs/org.eclipse.wst.validation.doc.isv/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 # IBM Corporation - initial API and implementation
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 e6a3950..f3a3dad 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
@@ -44,7 +44,9 @@
 All rights reserved. This program and the accompanying materials are made 
 available under the terms of the Eclipse Public License v1.0 which accompanies 
 this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</a>
 
 </p>
 </BODY>
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 d8ffd90..78c5e13 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
@@ -38,7 +38,9 @@
 All rights reserved. This program and the accompanying materials are made 
 available under the terms of the Eclipse Public License v1.0 which accompanies 
 this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</a>
 
 </p>
 </BODY>
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 d8bec99..428f277 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
@@ -39,7 +39,9 @@
 All rights reserved. This program and the accompanying materials are made 
 available under the terms of the Eclipse Public License v1.0 which accompanies 
 this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</a>
 
 </p>
 </BODY>
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 c013c1b..fc1b3b8 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
@@ -335,7 +335,9 @@
 All rights reserved. This program and the accompanying materials are made 
 available under the terms of the Eclipse Public License v1.0 which accompanies 
 this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</a>
 
 </p>
 </BODY>
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 360f4fd..e1d0dc3 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
@@ -47,7 +47,9 @@
 All rights reserved. This program and the accompanying materials are made 
 available under the terms of the Eclipse Public License v1.0 which accompanies 
 this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</a>
 
 </p>
 </BODY>
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 7a40e1b..2ddb5e1 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
@@ -82,7 +82,9 @@
 All rights reserved. This program and the accompanying materials are made 
 available under the terms of the Eclipse Public License v1.0 which accompanies 
 this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</a>
 
 </p>
 </BODY>
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 ef5d812..62f6479 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
@@ -160,7 +160,9 @@
 All rights reserved. This program and the accompanying materials are made 
 available under the terms of the Eclipse Public License v1.0 which accompanies 
 this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.wst.validation.infopop/about.html b/docs/org.eclipse.wst.validation.infopop/about.html
index 2199df3..8fbbe3c 100644
--- a/docs/org.eclipse.wst.validation.infopop/about.html
+++ b/docs/org.eclipse.wst.validation.infopop/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/features/org.eclipse.jst.common.fproj.enablement.jdt.feature/feature.properties b/features/org.eclipse.jst.common.fproj.enablement.jdt.feature/feature.properties
index 9a326a1..b212823 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
@@ -16,7 +16,8 @@
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n
+https://www.eclipse.org/legal/epl-2.0/
+\n
 ################ end of copyright property ####################################
 
 # "licenseURL" property - URL of the "Feature License"
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 7da3fac..27690c4 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
@@ -16,7 +16,8 @@
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n
+https://www.eclipse.org/legal/epl-2.0/
+\n
 ################ end of copyright property ####################################
 
 # "licenseURL" property - URL of the "Feature License"
diff --git a/features/org.eclipse.wst.common.fproj.feature/feature.properties b/features/org.eclipse.wst.common.fproj.feature/feature.properties
index b8ac3d2..10eb89e 100644
--- a/features/org.eclipse.wst.common.fproj.feature/feature.properties
+++ b/features/org.eclipse.wst.common.fproj.feature/feature.properties
@@ -16,7 +16,8 @@
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n
+https://www.eclipse.org/legal/epl-2.0/
+\n
 ################ end of copyright property ####################################
 
 # "licenseURL" property - URL of the "Feature License"
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 7fab8d0..98e9bb0 100644
--- a/features/org.eclipse.wst.common.fproj.sdk.feature/feature.properties
+++ b/features/org.eclipse.wst.common.fproj.sdk.feature/feature.properties
@@ -16,7 +16,8 @@
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n
+https://www.eclipse.org/legal/epl-2.0/
+\n
 ################ end of copyright property ####################################
 
 # "licenseURL" property - URL of the "Feature License"
diff --git a/features/org.eclipse.wst.common_core.feature/feature.properties b/features/org.eclipse.wst.common_core.feature/feature.properties
index 00d5dd1..f4ae068 100644
--- a/features/org.eclipse.wst.common_core.feature/feature.properties
+++ b/features/org.eclipse.wst.common_core.feature/feature.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2006 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
@@ -30,7 +30,8 @@
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
+https://www.eclipse.org/legal/epl-2.0/
+\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/build.properties
index be839a7..4ae2428 100644
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2000, 2005 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
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 65863b08..f1851be 100644
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2006 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
@@ -29,7 +29,8 @@
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
+https://www.eclipse.org/legal/epl-2.0/
+\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.wst.common_sdk.feature/feature.properties b/features/org.eclipse.wst.common_sdk.feature/feature.properties
index c4b4fe1..18bd8b2 100644
--- a/features/org.eclipse.wst.common_sdk.feature/feature.properties
+++ b/features/org.eclipse.wst.common_sdk.feature/feature.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2006 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
@@ -30,7 +30,8 @@
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
+https://www.eclipse.org/legal/epl-2.0/
+\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.wst.common_tests.feature/feature.properties b/features/org.eclipse.wst.common_tests.feature/feature.properties
index 5dd6e9a..42173ba 100644
--- a/features/org.eclipse.wst.common_tests.feature/feature.properties
+++ b/features/org.eclipse.wst.common_tests.feature/feature.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2006 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
@@ -30,7 +30,8 @@
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
+https://www.eclipse.org/legal/epl-2.0/
+\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.wst.common_ui.feature/feature.properties b/features/org.eclipse.wst.common_ui.feature/feature.properties
index 6c5080f..334b095 100644
--- a/features/org.eclipse.wst.common_ui.feature/feature.properties
+++ b/features/org.eclipse.wst.common_ui.feature/feature.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2006 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
@@ -30,7 +30,8 @@
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
+https://www.eclipse.org/legal/epl-2.0/
+\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/build.properties
index 37fd0e9..23ced66 100644
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2000, 2005 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
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 9c51ee6..c1652d3 100644
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2000, 2005 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
@@ -31,7 +31,8 @@
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
+https://www.eclipse.org/legal/epl-2.0/
+\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
diff --git a/plugins/org.eclipse.jem.util/about.html b/plugins/org.eclipse.jem.util/about.html
index 5acea59..a36f6b1 100644
--- a/plugins/org.eclipse.jem.util/about.html
+++ b/plugins/org.eclipse.jem.util/about.html
@@ -12,7 +12,9 @@
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+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>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/plugins/org.eclipse.jem.util/build.properties b/plugins/org.eclipse.jem.util/build.properties
index aa0d851..0ab414b 100644
--- a/plugins/org.eclipse.jem.util/build.properties
+++ b/plugins/org.eclipse.jem.util/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # 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
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
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 f9f238e..e35c865 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,9 @@
 <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="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+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/
+">https://www.eclipse.org/legal/epl-2.0/
+</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <h3>Contributions</h3>
diff --git a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/build.properties b/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/build.properties
index 3a4db57..afe93f8 100644
--- a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/build.properties
+++ b/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # 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
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/plugin.properties b/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/plugin.properties
index 5720eeb..0e7fe65 100644
--- a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/plugin.properties
+++ b/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # 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
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.jem.util/plugin.properties b/plugins/org.eclipse.jem.util/plugin.properties
index a53db6a..660a9df 100644
--- a/plugins/org.eclipse.jem.util/plugin.properties
+++ b/plugins/org.eclipse.jem.util/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.jem.util/property_files/emfworkbench.properties b/plugins/org.eclipse.jem.util/property_files/emfworkbench.properties
index cad9483..ed5bca3 100644
--- a/plugins/org.eclipse.jem.util/property_files/emfworkbench.properties
+++ b/plugins/org.eclipse.jem.util/property_files/emfworkbench.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.jem.util/schema/uiTester.exsd b/plugins/org.eclipse.jem.util/schema/uiTester.exsd
index 729ab32..1c7c8de 100644
--- a/plugins/org.eclipse.jem.util/schema/uiTester.exsd
+++ b/plugins/org.eclipse.jem.util/schema/uiTester.exsd
@@ -121,7 +121,9 @@
 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 
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+&lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
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 2199df3..8fbbe3c 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
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.jst.common.project.facet.core/about.html b/plugins/org.eclipse.jst.common.project.facet.core/about.html
index 2199df3..8fbbe3c 100644
--- a/plugins/org.eclipse.jst.common.project.facet.core/about.html
+++ b/plugins/org.eclipse.jst.common.project.facet.core/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.jst.common.project.facet.core/schemas/downloadableLibraries.exsd b/plugins/org.eclipse.jst.common.project.facet.core/schemas/downloadableLibraries.exsd
index 3481b7e..ffd770a 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
@@ -118,7 +118,8 @@
     &lt;name&gt;EclipseLink 1.0.0&lt;/name&gt;
     &lt;download-provider&gt;Eclipse Foundation&lt;/download-provider&gt;
     &lt;download-url&gt;&lt;![CDATA[http://www.eclipse.org/downloads/...]]&gt;&lt;/download-url&gt;
-    &lt;license-url&gt;&lt;![CDATA[http://www.eclipse.org/legal/epl-v10.html]]&gt;&lt;/license-url&gt;&gt;
+    &lt;license-url&gt;&lt;![CDATA[https://www.eclipse.org/legal/epl-2.0/
+]]&gt;&lt;/license-url&gt;&gt;
     &lt;attributes&gt;
       &lt;component&gt;eclipselink/jlib/eclipselink.jar&lt;/component&gt;
       &lt;source&gt;eclipselink/jlib/eclipselink-src.zip&lt;/source&gt;
@@ -141,7 +142,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
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 7619cd6..5c65835 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
@@ -107,7 +107,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
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 0e4e347..3a22f17 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
@@ -238,7 +238,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
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 73db36e..9011dc5 100644
--- a/plugins/org.eclipse.jst.common.project.facet.ui/about.html
+++ b/plugins/org.eclipse.jst.common.project.facet.ui/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.jst.common.project.facet.ui/schemas/libraryProviderActionPanels.exsd b/plugins/org.eclipse.jst.common.project.facet.ui/schemas/libraryProviderActionPanels.exsd
index dc0c5ef..8841c42 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
@@ -117,7 +117,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.wst.common.core/about.html b/plugins/org.eclipse.wst.common.core/about.html
index 2199df3..8fbbe3c 100644
--- a/plugins/org.eclipse.wst.common.core/about.html
+++ b/plugins/org.eclipse.wst.common.core/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.wst.common.core/schema/uiTester.exsd b/plugins/org.eclipse.wst.common.core/schema/uiTester.exsd
index df8bb48..52ab4fa 100644
--- a/plugins/org.eclipse.wst.common.core/schema/uiTester.exsd
+++ b/plugins/org.eclipse.wst.common.core/schema/uiTester.exsd
@@ -126,7 +126,9 @@
 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 
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+&lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/internal/messages.properties b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/internal/messages.properties
index e3a01a8..410d298 100644
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/internal/messages.properties
+++ b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/internal/messages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2006 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.common.emf/about.html b/plugins/org.eclipse.wst.common.emf/about.html
index 2199df3..8fbbe3c 100644
--- a/plugins/org.eclipse.wst.common.emf/about.html
+++ b/plugins/org.eclipse.wst.common.emf/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.wst.common.emf/build.properties b/plugins/org.eclipse.wst.common.emf/build.properties
index ed37cff..e5b8d4f 100644
--- a/plugins/org.eclipse.wst.common.emf/build.properties
+++ b/plugins/org.eclipse.wst.common.emf/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # 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
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 # IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.common.emf/plugin.properties b/plugins/org.eclipse.wst.common.emf/plugin.properties
index fc83d04..993f167 100644
--- a/plugins/org.eclipse.wst.common.emf/plugin.properties
+++ b/plugins/org.eclipse.wst.common.emf/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2006 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.common.emf/schema/packageURIMap.exsd b/plugins/org.eclipse.wst.common.emf/schema/packageURIMap.exsd
index 4f9d955..338d3ad 100644
--- a/plugins/org.eclipse.wst.common.emf/schema/packageURIMap.exsd
+++ b/plugins/org.eclipse.wst.common.emf/schema/packageURIMap.exsd
@@ -106,7 +106,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.wst.common.emf/schema/translatorExtension.exsd b/plugins/org.eclipse.wst.common.emf/schema/translatorExtension.exsd
index 5aa9669..4b860ca 100644
--- a/plugins/org.eclipse.wst.common.emf/schema/translatorExtension.exsd
+++ b/plugins/org.eclipse.wst.common.emf/schema/translatorExtension.exsd
@@ -96,7 +96,8 @@
       </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 http://www.eclipse.org/legal/epl-v10.html
+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/
+
       </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 32debc9..beed8ed 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 ba135f5..2ee2611 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 a954f5f..5709877 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 2af74c3..b792d94 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 9782ea1..3a2d0f3 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 ff4fbbb..c03064c 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 f5cd1f9..ae49baf 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 3e479f5..fbb84f8 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 2a9fe76..cc35d1a 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 356c05f..2da17e9 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 a38b83b..e0041c5 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 6678b51..223734f 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 32c9c47..680b97d 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 9427fb7..ac91f05 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 847b88d..6cd10a5 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 38c24d1..7a16166 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 18b8d14..84adedb 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 161c069..4091701 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 a03e653..3f2ff6a 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 d7d114c..5f5d4af 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 1a4a736..0926318 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 f237158..2082448 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 1334efb..cd8b644 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 a46a97c..51a0f0c 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 79c8046..29b0187 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 2ec67d4..0fd06fa 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 975db26..d4cd0ec 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 4012a7b..1b05539 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 58459bf..de3c0ca 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils.properties b/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils.properties
index 4b2e2ae..90b4873 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils.properties
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # 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
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 # IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/about.html b/plugins/org.eclipse.wst.common.emfworkbench.integration/about.html
index 2199df3..8fbbe3c 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/about.html
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/build.properties b/plugins/org.eclipse.wst.common.emfworkbench.integration/build.properties
index 3df22d3..59b766d 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/build.properties
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # 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
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 # IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/plugin.properties b/plugins/org.eclipse.wst.common.emfworkbench.integration/plugin.properties
index a7b84f1..8b23844 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/plugin.properties
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2006 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/property_file/emftosed.properties b/plugins/org.eclipse.wst.common.emfworkbench.integration/property_file/emftosed.properties
index 77d84df..50366b0 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/property_file/emftosed.properties
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/property_file/emftosed.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/property_file/emfworkbenchedit.properties b/plugins/org.eclipse.wst.common.emfworkbench.integration/property_file/emfworkbenchedit.properties
index 631d1c3..cf27070 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/property_file/emfworkbenchedit.properties
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/property_file/emfworkbenchedit.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # 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
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 # IBM Corporation - initial API and implementation
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 d0100dc..edab7c4 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/adapterFactory.exsd
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/adapterFactory.exsd
@@ -137,7 +137,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
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 14743b2..f174fd9 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/editModel.exsd
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/editModel.exsd
@@ -191,7 +191,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
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 006d2ae..1652212 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/editModelExtension.exsd
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/editModelExtension.exsd
@@ -123,7 +123,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
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 9cc07db..9373a0d 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/modifierHelperFactory.exsd
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/modifierHelperFactory.exsd
@@ -153,7 +153,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
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 6299bd5..45d8503 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 8efb8c1..af2fd59 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 7061e7d..532a875 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 460a84a..de742f7 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 4b8bc60..211ae5f 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 47545d3..79e635c 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
diff --git a/plugins/org.eclipse.wst.common.environment/about.html b/plugins/org.eclipse.wst.common.environment/about.html
index 2199df3..8fbbe3c 100644
--- a/plugins/org.eclipse.wst.common.environment/about.html
+++ b/plugins/org.eclipse.wst.common.environment/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.wst.common.environment/build.properties b/plugins/org.eclipse.wst.common.environment/build.properties
index c8aea41..ab995d0 100644
--- a/plugins/org.eclipse.wst.common.environment/build.properties
+++ b/plugins/org.eclipse.wst.common.environment/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2006 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.common.environment/plugin.properties b/plugins/org.eclipse.wst.common.environment/plugin.properties
index 1e01ac9..9aa27b0 100644
--- a/plugins/org.eclipse.wst.common.environment/plugin.properties
+++ b/plugins/org.eclipse.wst.common.environment/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2006, 2009 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
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 53cae74..7e69493 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 638a3e0..d0b817f 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/environment.properties b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/environment.properties
index 97908ad..86b2345 100644
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/environment.properties
+++ b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/environment.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2001, 2005 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.common.fproj.sdk/about.html b/plugins/org.eclipse.wst.common.fproj.sdk/about.html
index 2199df3..8fbbe3c 100644
--- a/plugins/org.eclipse.wst.common.fproj.sdk/about.html
+++ b/plugins/org.eclipse.wst.common.fproj.sdk/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/about.html b/plugins/org.eclipse.wst.common.frameworks.ui/about.html
index 2199df3..8fbbe3c 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/about.html
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/build.properties b/plugins/org.eclipse.wst.common.frameworks.ui/build.properties
index 599bd39..bc0d05a 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/build.properties
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # 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
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 # IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/plugin.properties b/plugins/org.eclipse.wst.common.frameworks.ui/plugin.properties
index 20819aa..d37dcd3 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/plugin.properties
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # 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
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 # IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/property_files/messages.properties b/plugins/org.eclipse.wst.common.frameworks.ui/property_files/messages.properties
index e14128d..ef9f792 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/property_files/messages.properties
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/property_files/messages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2000, 2006 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/property_files/wtpcommonui.properties b/plugins/org.eclipse.wst.common.frameworks.ui/property_files/wtpcommonui.properties
index d35ea00..dc3651d 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/property_files/wtpcommonui.properties
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/property_files/wtpcommonui.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # 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
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 # IBM Corporation - initial API and implementation
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 40c75b4..afa34e1 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/schema/DataModelWizardExtension.exsd
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/schema/DataModelWizardExtension.exsd
@@ -106,7 +106,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
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 9749927..caa75aa 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendableWizard.exsd
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendableWizard.exsd
@@ -96,7 +96,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
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 e10a9cc..c78a144 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendableWizardPage.exsd
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendableWizardPage.exsd
@@ -127,7 +127,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
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 aa8908a..c7d3c65 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendedViewer.exsd
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendedViewer.exsd
@@ -131,7 +131,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
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 332f105..e0b04c4 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/schema/menuEnabler.exsd
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/schema/menuEnabler.exsd
@@ -96,7 +96,8 @@
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Public License v1.0
   which accompanies this distribution, and is available at
-  http://www.eclipse.org/legal/epl-v10.html
+  https://www.eclipse.org/legal/epl-2.0/
+
  
   Contributors:
       IBM Corporation - initial API and implementation
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 1f8861b..aae1964 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/schema/wtpuiAction.exsd
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/schema/wtpuiAction.exsd
@@ -360,7 +360,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
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 53c3360..8a98d5a 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 0e936ef..204f0f6 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/eclipse/ui/environment.properties b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/eclipse/ui/environment.properties
index eefde94..c3eb234 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/eclipse/ui/environment.properties
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/eclipse/ui/environment.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2001, 2005 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
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 2cc778a..a73a6a9 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 99fb6f8..d70ebe3 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
@@ -2,7 +2,8 @@
  * 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
- * available at http://www.eclipse.org/legal/epl-v10.html
+ * available at https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: 
  * IBM - Initial API and implementation
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 22ad059..02c2c60 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 44db38f..5945b0e 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
diff --git a/plugins/org.eclipse.wst.common.frameworks/about.html b/plugins/org.eclipse.wst.common.frameworks/about.html
index 2199df3..8fbbe3c 100644
--- a/plugins/org.eclipse.wst.common.frameworks/about.html
+++ b/plugins/org.eclipse.wst.common.frameworks/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.wst.common.frameworks/build.properties b/plugins/org.eclipse.wst.common.frameworks/build.properties
index 4701114..a956b7b 100644
--- a/plugins/org.eclipse.wst.common.frameworks/build.properties
+++ b/plugins/org.eclipse.wst.common.frameworks/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # 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
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 # IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.common.frameworks/plugin.properties b/plugins/org.eclipse.wst.common.frameworks/plugin.properties
index d56d20d..0ac3338 100644
--- a/plugins/org.eclipse.wst.common.frameworks/plugin.properties
+++ b/plugins/org.eclipse.wst.common.frameworks/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # 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
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 # IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.common.frameworks/schema/DataModelProviderExtension.exsd b/plugins/org.eclipse.wst.common.frameworks/schema/DataModelProviderExtension.exsd
index 301984a..705d01d 100644
--- a/plugins/org.eclipse.wst.common.frameworks/schema/DataModelProviderExtension.exsd
+++ b/plugins/org.eclipse.wst.common.frameworks/schema/DataModelProviderExtension.exsd
@@ -146,7 +146,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.wst.common.frameworks/schema/OperationExtension.exsd b/plugins/org.eclipse.wst.common.frameworks/schema/OperationExtension.exsd
index d6f1ea2..9ed1a53 100644
--- a/plugins/org.eclipse.wst.common.frameworks/schema/OperationExtension.exsd
+++ b/plugins/org.eclipse.wst.common.frameworks/schema/OperationExtension.exsd
@@ -112,7 +112,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.wst.common.frameworks/schema/WTPActivityBridgeHelper.exsd b/plugins/org.eclipse.wst.common.frameworks/schema/WTPActivityBridgeHelper.exsd
index 67d50e7..57b1f1c 100644
--- a/plugins/org.eclipse.wst.common.frameworks/schema/WTPActivityBridgeHelper.exsd
+++ b/plugins/org.eclipse.wst.common.frameworks/schema/WTPActivityBridgeHelper.exsd
@@ -96,7 +96,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.wst.common.frameworks/schema/functionGroup.exsd b/plugins/org.eclipse.wst.common.frameworks/schema/functionGroup.exsd
index 1809594..9160f92 100644
--- a/plugins/org.eclipse.wst.common.frameworks/schema/functionGroup.exsd
+++ b/plugins/org.eclipse.wst.common.frameworks/schema/functionGroup.exsd
@@ -179,7 +179,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
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 67cac79..e75c8d9 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/wtp_common.properties b/plugins/org.eclipse.wst.common.frameworks/src/wtp_common.properties
index f8e9abb..eb2ceaf 100644
--- a/plugins/org.eclipse.wst.common.frameworks/src/wtp_common.properties
+++ b/plugins/org.eclipse.wst.common.frameworks/src/wtp_common.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2003, 2012 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 # IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.common.infopop/about.html b/plugins/org.eclipse.wst.common.infopop/about.html
index 2199df3..8fbbe3c 100644
--- a/plugins/org.eclipse.wst.common.infopop/about.html
+++ b/plugins/org.eclipse.wst.common.infopop/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/about.html b/plugins/org.eclipse.wst.common.modulecore.ui/about.html
index b6ed5b0..3c942cf 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/about.html
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/build.properties b/plugins/org.eclipse.wst.common.modulecore.ui/build.properties
index ef0787e..3699044 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/build.properties
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2009 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 # IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/plugin.properties b/plugins/org.eclipse.wst.common.modulecore.ui/plugin.properties
index a963071..b523895 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/plugin.properties
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2009 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 # IBM Corporation - initial API and implementation
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 36e2203..f88a252 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/schema/deploymentAssemblyVerifier.exsd
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/schema/deploymentAssemblyVerifier.exsd
@@ -108,7 +108,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
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 38b775a..53111de 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/schema/resourceMappingFilter.exsd
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/schema/resourceMappingFilter.exsd
@@ -90,7 +90,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.wst.common.modulecore/about.html b/plugins/org.eclipse.wst.common.modulecore/about.html
index 2199df3..8fbbe3c 100644
--- a/plugins/org.eclipse.wst.common.modulecore/about.html
+++ b/plugins/org.eclipse.wst.common.modulecore/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.wst.common.modulecore/build.properties b/plugins/org.eclipse.wst.common.modulecore/build.properties
index e225d3f..fd943c2 100644
--- a/plugins/org.eclipse.wst.common.modulecore/build.properties
+++ b/plugins/org.eclipse.wst.common.modulecore/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.common.modulecore/model/Java.properties b/plugins/org.eclipse.wst.common.modulecore/model/Java.properties
index 563b5df..c2d7cf1 100644
--- a/plugins/org.eclipse.wst.common.modulecore/model/Java.properties
+++ b/plugins/org.eclipse.wst.common.modulecore/model/Java.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/modulecore.properties b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/modulecore.properties
index d307f4a..b816f62 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/modulecore.properties
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/modulecore.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # 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
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 # IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/modulecoreNLS.properties b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/modulecoreNLS.properties
index f76b2da..a335555 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/modulecoreNLS.properties
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/modulecoreNLS.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # 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
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 # IBM Corporation - initial API and implementation
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 838187d..93d8905 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
@@ -3,7 +3,8 @@
  * 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, 
- * and is available at http://www.eclipse.org/legal/epl-v10.html 
+ * and is available at https://www.eclipse.org/legal/epl-2.0/
+ 
  * 
  * Contributors: 
  * Red Hat, Inc. - initial API and implementation 
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 11d89f3..6a6238e 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
@@ -3,7 +3,8 @@
  * 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, 
- * and is available at http://www.eclipse.org/legal/epl-v10.html 
+ * and is available at https://www.eclipse.org/legal/epl-2.0/
+ 
  * 
  * Contributors: 
  * Red Hat, Inc. - initial API and implementation 
diff --git a/plugins/org.eclipse.wst.common.modulecore/plugin.properties b/plugins/org.eclipse.wst.common.modulecore/plugin.properties
index 883476b..2a5725f 100644
--- a/plugins/org.eclipse.wst.common.modulecore/plugin.properties
+++ b/plugins/org.eclipse.wst.common.modulecore/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2003, 2007 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 # IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.common.modulecore/schema/ComponentProjectMigrator.exsd b/plugins/org.eclipse.wst.common.modulecore/schema/ComponentProjectMigrator.exsd
index edaf17f..8131f9d 100644
--- a/plugins/org.eclipse.wst.common.modulecore/schema/ComponentProjectMigrator.exsd
+++ b/plugins/org.eclipse.wst.common.modulecore/schema/ComponentProjectMigrator.exsd
@@ -119,7 +119,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.wst.common.modulecore/schema/artifactedit.exsd b/plugins/org.eclipse.wst.common.modulecore/schema/artifactedit.exsd
index c46f74e..1d07c89 100644
--- a/plugins/org.eclipse.wst.common.modulecore/schema/artifactedit.exsd
+++ b/plugins/org.eclipse.wst.common.modulecore/schema/artifactedit.exsd
@@ -105,7 +105,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
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 2199df3..8fbbe3c 100644
--- a/plugins/org.eclipse.wst.common.project.facet.core/about.html
+++ b/plugins/org.eclipse.wst.common.project.facet.core/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.wst.common.project.facet.core/schemas/aliases.exsd b/plugins/org.eclipse.wst.common.project.facet.core/schemas/aliases.exsd
index 755eaf5..8640b62 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
@@ -132,7 +132,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
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 a5f23f2..4031fb9 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
@@ -216,7 +216,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
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 d2a4e2e..f008b7e 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
@@ -94,7 +94,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
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 98cd6ac..6f0fc08 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
@@ -769,7 +769,9 @@
 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
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;.
+&lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;.
       </documentation>
    </annotation>
 
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 724fdef..4a1e8a9 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
@@ -197,7 +197,9 @@
 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
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;.
+&lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;.
       </documentation>
    </annotation>
 
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 f4e9245..4cedf7b 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
@@ -140,7 +140,9 @@
 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
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;.
+&lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;.
       </documentation>
    </annotation>
 
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 005e85e..1b4f02d 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
@@ -207,7 +207,9 @@
 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
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;.
+&lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;.
       </documentation>
    </annotation>
 
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 2741522..9351e55 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
@@ -116,7 +116,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
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 0a9a757..e30b4f1 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
@@ -298,7 +298,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
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 91e1b0a..65d66fc 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
@@ -139,7 +139,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
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 2199df3..8fbbe3c 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
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.wst.common.project.facet.ui/about.html b/plugins/org.eclipse.wst.common.project.facet.ui/about.html
index 2199df3..8fbbe3c 100644
--- a/plugins/org.eclipse.wst.common.project.facet.ui/about.html
+++ b/plugins/org.eclipse.wst.common.project.facet.ui/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.wst.common.project.facet.ui/schemas/images.exsd b/plugins/org.eclipse.wst.common.project.facet.ui/schemas/images.exsd
index 43a279e..36714dc 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
@@ -127,7 +127,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
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 17fba98..1e68045 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
@@ -193,7 +193,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
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 fd3bf3a..8d92367 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
@@ -144,7 +144,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.wst.common.ui/about.html b/plugins/org.eclipse.wst.common.ui/about.html
index 2199df3..8fbbe3c 100644
--- a/plugins/org.eclipse.wst.common.ui/about.html
+++ b/plugins/org.eclipse.wst.common.ui/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.wst.common.ui/schema/exampleProjectCreationWizard.exsd b/plugins/org.eclipse.wst.common.ui/schema/exampleProjectCreationWizard.exsd
index 578c329..c1f5338 100644
--- a/plugins/org.eclipse.wst.common.ui/schema/exampleProjectCreationWizard.exsd
+++ b/plugins/org.eclipse.wst.common.ui/schema/exampleProjectCreationWizard.exsd
@@ -236,7 +236,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchMessages.properties b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchMessages.properties
index d3e9f83..4b1e19b 100644
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchMessages.properties
+++ b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchMessages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2000, 2007 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.common.uriresolver/about.html b/plugins/org.eclipse.wst.common.uriresolver/about.html
index 2199df3..8fbbe3c 100644
--- a/plugins/org.eclipse.wst.common.uriresolver/about.html
+++ b/plugins/org.eclipse.wst.common.uriresolver/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.wst.common.uriresolver/plugin.properties b/plugins/org.eclipse.wst.common.uriresolver/plugin.properties
index f4e6c2f..34afb29 100644
--- a/plugins/org.eclipse.wst.common.uriresolver/plugin.properties
+++ b/plugins/org.eclipse.wst.common.uriresolver/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2010 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.common.uriresolver/schema/resolverExtensions.exsd b/plugins/org.eclipse.wst.common.uriresolver/schema/resolverExtensions.exsd
index 9156584..eaca6ae 100644
--- a/plugins/org.eclipse.wst.common.uriresolver/schema/resolverExtensions.exsd
+++ b/plugins/org.eclipse.wst.common.uriresolver/schema/resolverExtensions.exsd
@@ -160,7 +160,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.wst.internet.cache/about.html b/plugins/org.eclipse.wst.internet.cache/about.html
index 2199df3..8fbbe3c 100644
--- a/plugins/org.eclipse.wst.internet.cache/about.html
+++ b/plugins/org.eclipse.wst.internet.cache/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.wst.internet.cache/exsd/cacheresource.exsd b/plugins/org.eclipse.wst.internet.cache/exsd/cacheresource.exsd
index 8d0dd11..e69cf7e 100644
--- a/plugins/org.eclipse.wst.internet.cache/exsd/cacheresource.exsd
+++ b/plugins/org.eclipse.wst.internet.cache/exsd/cacheresource.exsd
@@ -102,7 +102,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.wst.internet.cache/plugin.properties b/plugins/org.eclipse.wst.internet.cache/plugin.properties
index 486991e..61220b3 100644
--- a/plugins/org.eclipse.wst.internet.cache/plugin.properties
+++ b/plugins/org.eclipse.wst.internet.cache/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2017 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/CachePluginResources.properties b/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/CachePluginResources.properties
index 3de7808..569f174 100644
--- a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/CachePluginResources.properties
+++ b/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/CachePluginResources.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2017 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.validation.ui/about.html b/plugins/org.eclipse.wst.validation.ui/about.html
index 2199df3..8fbbe3c 100644
--- a/plugins/org.eclipse.wst.validation.ui/about.html
+++ b/plugins/org.eclipse.wst.validation.ui/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.wst.validation.ui/build.properties b/plugins/org.eclipse.wst.validation.ui/build.properties
index 6f3d6eb..4afcab1 100644
--- a/plugins/org.eclipse.wst.validation.ui/build.properties
+++ b/plugins/org.eclipse.wst.validation.ui/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2001, 2007 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 # IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.validation.ui/plugin.properties b/plugins/org.eclipse.wst.validation.ui/plugin.properties
index 9c1aed1..7c1b856 100755
--- a/plugins/org.eclipse.wst.validation.ui/plugin.properties
+++ b/plugins/org.eclipse.wst.validation.ui/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2001, 2018 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 # IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/internal/ui/validationui.properties b/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/internal/ui/validationui.properties
index 4db102d..f1f9835 100644
--- a/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/internal/ui/validationui.properties
+++ b/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/internal/ui/validationui.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/ui/internal/messages.properties b/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/ui/internal/messages.properties
index dd25b6e..a26f78e 100644
--- a/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/ui/internal/messages.properties
+++ b/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/ui/internal/messages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2001, 2009 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 # 
 # Contributors:
 # IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.validation/about.html b/plugins/org.eclipse.wst.validation/about.html
index 2199df3..8fbbe3c 100644
--- a/plugins/org.eclipse.wst.validation/about.html
+++ b/plugins/org.eclipse.wst.validation/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.wst.validation/build.properties b/plugins/org.eclipse.wst.validation/build.properties
index 167d165..e9c8eb7 100644
--- a/plugins/org.eclipse.wst.validation/build.properties
+++ b/plugins/org.eclipse.wst.validation/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2001, 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 # IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.validation/plugin.properties b/plugins/org.eclipse.wst.validation/plugin.properties
index 0fcb3b5..8500672 100644
--- a/plugins/org.eclipse.wst.validation/plugin.properties
+++ b/plugins/org.eclipse.wst.validation/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2001, 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 # IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.validation/property_files/org/eclipse/wst/validation/internal/messages.properties b/plugins/org.eclipse.wst.validation/property_files/org/eclipse/wst/validation/internal/messages.properties
index 26b62fb..ab38868 100644
--- a/plugins/org.eclipse.wst.validation/property_files/org/eclipse/wst/validation/internal/messages.properties
+++ b/plugins/org.eclipse.wst.validation/property_files/org/eclipse/wst/validation/internal/messages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2011 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.validation/property_files/validate_base.properties b/plugins/org.eclipse.wst.validation/property_files/validate_base.properties
index 9e2583d..6da97a6 100644
--- a/plugins/org.eclipse.wst.validation/property_files/validate_base.properties
+++ b/plugins/org.eclipse.wst.validation/property_files/validate_base.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2001, 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 # IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.wst.validation/xsds/referencialFileExtSchema.exsd b/plugins/org.eclipse.wst.validation/xsds/referencialFileExtSchema.exsd
index fcfe873..99f05a3 100644
--- a/plugins/org.eclipse.wst.validation/xsds/referencialFileExtSchema.exsd
+++ b/plugins/org.eclipse.wst.validation/xsds/referencialFileExtSchema.exsd
@@ -111,7 +111,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.wst.validation/xsds/removeV2Validator.exsd b/plugins/org.eclipse.wst.validation/xsds/removeV2Validator.exsd
index 271b82e..1dba151 100644
--- a/plugins/org.eclipse.wst.validation/xsds/removeV2Validator.exsd
+++ b/plugins/org.eclipse.wst.validation/xsds/removeV2Validator.exsd
@@ -116,7 +116,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.wst.validation/xsds/validationHelper.exsd b/plugins/org.eclipse.wst.validation/xsds/validationHelper.exsd
index fd854dc..f5c216a 100644
--- a/plugins/org.eclipse.wst.validation/xsds/validationHelper.exsd
+++ b/plugins/org.eclipse.wst.validation/xsds/validationHelper.exsd
@@ -106,7 +106,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.wst.validation/xsds/validationSelectionHandler.exsd b/plugins/org.eclipse.wst.validation/xsds/validationSelectionHandler.exsd
index acffbfa..ea16667 100644
--- a/plugins/org.eclipse.wst.validation/xsds/validationSelectionHandler.exsd
+++ b/plugins/org.eclipse.wst.validation/xsds/validationSelectionHandler.exsd
@@ -110,7 +110,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.wst.validation/xsds/validator.exsd b/plugins/org.eclipse.wst.validation/xsds/validator.exsd
index 35bc948..e62bd49 100644
--- a/plugins/org.eclipse.wst.validation/xsds/validator.exsd
+++ b/plugins/org.eclipse.wst.validation/xsds/validator.exsd
@@ -441,7 +441,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.wst.validation/xsds/validatorDelegates.exsd b/plugins/org.eclipse.wst.validation/xsds/validatorDelegates.exsd
index 4a5f850..789b793 100644
--- a/plugins/org.eclipse.wst.validation/xsds/validatorDelegates.exsd
+++ b/plugins/org.eclipse.wst.validation/xsds/validatorDelegates.exsd
@@ -127,7 +127,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.wst.validation/xsds/validatorExtSchema.exsd b/plugins/org.eclipse.wst.validation/xsds/validatorExtSchema.exsd
index 0e9667e..c13eacb 100644
--- a/plugins/org.eclipse.wst.validation/xsds/validatorExtSchema.exsd
+++ b/plugins/org.eclipse.wst.validation/xsds/validatorExtSchema.exsd
@@ -319,7 +319,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.wst.validation/xsds/validatorgroup.exsd b/plugins/org.eclipse.wst.validation/xsds/validatorgroup.exsd
index df05cb1..a7ad3d6 100644
--- a/plugins/org.eclipse.wst.validation/xsds/validatorgroup.exsd
+++ b/plugins/org.eclipse.wst.validation/xsds/validatorgroup.exsd
@@ -154,7 +154,9 @@
 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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0/
+&quot;&gt;https://www.eclipse.org/legal/epl-2.0/
+&lt;/a&gt;
       </documentation>
    </annotation>
 
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 0799bdb..89fdb7e 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
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/tests/org.eclipse.wst.common.project.facet.ui.tests/about.html b/tests/org.eclipse.wst.common.project.facet.ui.tests/about.html
index 0799bdb..89fdb7e 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
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/tests/org.eclipse.wst.common.tests.collector/about.html b/tests/org.eclipse.wst.common.tests.collector/about.html
index 2199df3..8fbbe3c 100644
--- a/tests/org.eclipse.wst.common.tests.collector/about.html
+++ b/tests/org.eclipse.wst.common.tests.collector/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/tests/org.eclipse.wst.common.tests.ui/about.html b/tests/org.eclipse.wst.common.tests.ui/about.html
index 2199df3..8fbbe3c 100644
--- a/tests/org.eclipse.wst.common.tests.ui/about.html
+++ b/tests/org.eclipse.wst.common.tests.ui/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/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 7610e30..c2292ae 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 6443deb..a3561eb 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 996b02f..c05ebe0 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 670149d..368d282 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 5fb74f4..776ec04 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 ce6dde7..a537b0e 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 ecf4a34..fa3fb76 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 62a71b4..3877e4b 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 78963f9..42b0dc3 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 98a8355..2a2a5b3 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 ad285b9..ea0f3a1 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 0d05a9b..1c89088 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 2199df3..8fbbe3c 100644
--- a/tests/org.eclipse.wst.common.tests.validation.guard/about.html
+++ b/tests/org.eclipse.wst.common.tests.validation.guard/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/tests/org.eclipse.wst.common.tests.validation/about.html b/tests/org.eclipse.wst.common.tests.validation/about.html
index 2199df3..8fbbe3c 100644
--- a/tests/org.eclipse.wst.common.tests.validation/about.html
+++ b/tests/org.eclipse.wst.common.tests.validation/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/tests/org.eclipse.wst.common.tests/about.html b/tests/org.eclipse.wst.common.tests/about.html
index 2199df3..8fbbe3c 100644
--- a/tests/org.eclipse.wst.common.tests/about.html
+++ b/tests/org.eclipse.wst.common.tests/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/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 cf2ff0b..01c7e4f 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 abe8641..1530350 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 44d7c14..d3bb197 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 f95c777..80b025d 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 d68b988..00fa25d 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
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 5c5c900..31c6317 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
@@ -2,7 +2,8 @@
  * 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
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
diff --git a/tests/org.eclipse.wst.common.uriresolver.tests/about.html b/tests/org.eclipse.wst.common.uriresolver.tests/about.html
index 2199df3..8fbbe3c 100644
--- a/tests/org.eclipse.wst.common.uriresolver.tests/about.html
+++ b/tests/org.eclipse.wst.common.uriresolver.tests/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/tests/org.eclipse.wst.common.uriresolver.tests/plugin.properties b/tests/org.eclipse.wst.common.uriresolver.tests/plugin.properties
index 051b5d3..49c70d6 100644
--- a/tests/org.eclipse.wst.common.uriresolver.tests/plugin.properties
+++ b/tests/org.eclipse.wst.common.uriresolver.tests/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.wst.internet.cache.tests/about.html b/tests/org.eclipse.wst.internet.cache.tests/about.html
index 2199df3..8fbbe3c 100644
--- a/tests/org.eclipse.wst.internet.cache.tests/about.html
+++ b/tests/org.eclipse.wst.internet.cache.tests/about.html
@@ -18,7 +18,9 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/
+">https://www.eclipse.org/legal/epl-2.0/
+</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/tests/org.eclipse.wst.internet.cache.tests/plugin.properties b/tests/org.eclipse.wst.internet.cache.tests/plugin.properties
index ddf19d2..7106534 100644
--- a/tests/org.eclipse.wst.internet.cache.tests/plugin.properties
+++ b/tests/org.eclipse.wst.internet.cache.tests/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2001, 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
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation