Description: Fix license text (1.0 -> 2.0)

Origin: upstream, https://git.eclipse.org/c/webtools-common/webtools.common.git/commit/?id=8c4c72cb286a4e042a6ba7ec794e1a6659adf168

---

--- eclipse-wtp-3.18.orig/org.eclipse.jem.util/about.html
+++ eclipse-wtp-3.18/org.eclipse.jem.util/about.html
@@ -11,7 +11,7 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+Eclipse Public License v2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
 at <a href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
 </a>.
--- eclipse-wtp-3.18.orig/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/about.html
+++ eclipse-wtp-3.18/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/about.html
@@ -10,7 +10,7 @@
 <p>30th March, 2004</p>	
 <h3>License</h3>
 <p>Eclipse.org makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="https://www.eclipse.org/legal/epl-2.0/
+Eclipse Public License v2.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
 </a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
--- eclipse-wtp-3.18.orig/org.eclipse.jem.util/schema/uiTester.exsd
+++ eclipse-wtp-3.18/org.eclipse.jem.util/schema/uiTester.exsd
@@ -119,7 +119,7 @@ This is typically an internal extension
       <documentation>
          Copyright (c) 2004, 2006 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at 
 &lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.core/about.html
+++ eclipse-wtp-3.18/org.eclipse.wst.common.core/about.html
@@ -16,7 +16,7 @@
 
 <P>The Eclipse Foundation makes available all content in this plug-in 
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
+under the terms and conditions of the Eclipse Public License v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.core/schema/uiTester.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.core/schema/uiTester.exsd
@@ -124,7 +124,7 @@ This is typically an internal extension
       <documentation>
          Copyright (c) 2004, 2006 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at 
 &lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/about.html
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/about.html
@@ -16,7 +16,7 @@
 
 <P>The Eclipse Foundation makes available all content in this plug-in 
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
+under the terms and conditions of the Eclipse Public License v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/schema/packageURIMap.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/schema/packageURIMap.exsd
@@ -104,7 +104,7 @@
       <documentation>
          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/schema/translatorExtension.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/schema/translatorExtension.exsd
@@ -96,7 +96,7 @@
       </appInfo>
       <documentation>
          Copyright (c) 2005 IBM Corporation and others.
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
+All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
 
       </documentation>
    </annotation>
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AttributeTranslatorFilter.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AttributeTranslatorFilter.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityURIConverter.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityURIConverter.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResource.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResource.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMISaveImpl.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMISaveImpl.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMAdapter.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMAdapter.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRendererFactory.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRendererFactory.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/LinkUpdaterTarget.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/LinkUpdaterTarget.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ObjectTranslatorFilter.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ObjectTranslatorFilter.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIFactoryImpl.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIFactoryImpl.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RendererFactory.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RendererFactory.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorFilter.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorFilter.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorPath.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorPath.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResource.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResource.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceFactory.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceFactory.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ArrayUtil.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ArrayUtil.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/FeatureValueConversionException.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/FeatureValueConversionException.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordCipherException.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordCipherException.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordDecodingException.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordDecodingException.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordEncodingException.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordEncodingException.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IsLoadingDetector.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IsLoadingDetector.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Namespace.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Namespace.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordCipherUtil.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordCipherUtil.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordEncoderDecoder.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordEncoderDecoder.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordUtil.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordUtil.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceDependencyRegister.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceDependencyRegister.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Revisit.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Revisit.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/TranslatorManager.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/TranslatorManager.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2006 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/TranslatorService.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/TranslatorService.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2006 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/UnsupportedCryptoAlgorithmException.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/UnsupportedCryptoAlgorithmException.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emfworkbench.integration/about.html
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emfworkbench.integration/about.html
@@ -16,7 +16,7 @@
 
 <P>The Eclipse Foundation makes available all content in this plug-in 
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
+under the terms and conditions of the Eclipse Public License v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emfworkbench.integration/schema/adapterFactory.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emfworkbench.integration/schema/adapterFactory.exsd
@@ -135,7 +135,7 @@
       <documentation>
          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emfworkbench.integration/schema/editModel.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emfworkbench.integration/schema/editModel.exsd
@@ -189,7 +189,7 @@
       <documentation>
          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emfworkbench.integration/schema/editModelExtension.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emfworkbench.integration/schema/editModelExtension.exsd
@@ -121,7 +121,7 @@
       <documentation>
          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emfworkbench.integration/schema/modifierHelperFactory.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emfworkbench.integration/schema/modifierHelperFactory.exsd
@@ -151,7 +151,7 @@
       <documentation>
          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelResource.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelResource.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelRetriever.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelRetriever.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/AbstractEditModelCommand.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/AbstractEditModelCommand.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModelEvent.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModelEvent.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/ResourceStateInputProvider.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/ResourceStateInputProvider.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/ResourceStateValidatorPresenter.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/ResourceStateValidatorPresenter.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.environment/about.html
+++ eclipse-wtp-3.18/org.eclipse.wst.common.environment/about.html
@@ -16,7 +16,7 @@
 
 <P>The Eclipse Foundation makes available all content in this plug-in 
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
+under the terms and conditions of the Eclipse Public License v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/EnvironmentService.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/EnvironmentService.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/Messages.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/Messages.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.frameworks.ui/about.html
+++ eclipse-wtp-3.18/org.eclipse.wst.common.frameworks.ui/about.html
@@ -16,7 +16,7 @@
 
 <P>The Eclipse Foundation makes available all content in this plug-in 
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
+under the terms and conditions of the Eclipse Public License v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.frameworks.ui/schema/DataModelWizardExtension.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.frameworks.ui/schema/DataModelWizardExtension.exsd
@@ -104,7 +104,7 @@
       <documentation>
          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.frameworks.ui/schema/extendableWizard.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.frameworks.ui/schema/extendableWizard.exsd
@@ -94,7 +94,7 @@
       <documentation>
          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.frameworks.ui/schema/extendableWizardPage.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.frameworks.ui/schema/extendableWizardPage.exsd
@@ -125,7 +125,7 @@
       <documentation>
          Copyright (c) 2005, 2008 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.frameworks.ui/schema/extendedViewer.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.frameworks.ui/schema/extendedViewer.exsd
@@ -129,7 +129,7 @@
       <documentation>
          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.frameworks.ui/schema/menuEnabler.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.frameworks.ui/schema/menuEnabler.exsd
@@ -94,7 +94,7 @@ The class specified in className should
       <documentation>
          Copyright (c) 2010 IBM Corporation and others.
   All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
+  are made available under the terms of the Eclipse Public License v2.0
   which accompanies this distribution, and is available at
   https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.frameworks.ui/schema/wtpuiAction.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.frameworks.ui/schema/wtpuiAction.exsd
@@ -358,7 +358,7 @@ And if your operation is optional declar
       <documentation>
          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/AddablePageGroup.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/AddablePageGroup.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/SimplePageGroup.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/SimplePageGroup.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ExecutionListener.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ExecutionListener.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/InternalCommonWorkbenchMessages.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/InternalCommonWorkbenchMessages.java
@@ -1,7 +1,7 @@
 /**********************************************************************
  * Copyright (c) 2006 IBM Corporation and others. All rights reserved.   This
  * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
+ * the Eclipse Public License v2.0 which accompanies this distribution, and is
  * available at https://www.eclipse.org/legal/epl-2.0/
 
  * 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/SimplePageGroupHandler.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/SimplePageGroupHandler.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/SimplePageHandler.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/SimplePageHandler.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.frameworks/about.html
+++ eclipse-wtp-3.18/org.eclipse.wst.common.frameworks/about.html
@@ -16,7 +16,7 @@
 
 <P>The Eclipse Foundation makes available all content in this plug-in 
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
+under the terms and conditions of the Eclipse Public License v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.frameworks/schema/DataModelProviderExtension.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.frameworks/schema/DataModelProviderExtension.exsd
@@ -144,7 +144,7 @@
       <documentation>
          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.frameworks/schema/OperationExtension.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.frameworks/schema/OperationExtension.exsd
@@ -110,7 +110,7 @@
       <documentation>
          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.frameworks/schema/WTPActivityBridgeHelper.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.frameworks/schema/WTPActivityBridgeHelper.exsd
@@ -94,7 +94,7 @@
       <documentation>
          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.frameworks/schema/functionGroup.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.frameworks/schema/functionGroup.exsd
@@ -177,7 +177,7 @@
       <documentation>
          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.frameworks/src-non_workbench/org/eclipse/wst/common/frameworks/internal/enablement/nonui/WorkbenchUtil.java
+++ eclipse-wtp-3.18/org.eclipse.wst.common.frameworks/src-non_workbench/org/eclipse/wst/common/frameworks/internal/enablement/nonui/WorkbenchUtil.java
@@ -1,6 +1,6 @@
 /***************************************************************************************************
  * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
 
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.project.facet.core/about.html
+++ eclipse-wtp-3.18/org.eclipse.wst.common.project.facet.core/about.html
@@ -16,7 +16,7 @@
 
 <P>The Eclipse Foundation makes available all content in this plug-in 
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
+under the terms and conditions of the Eclipse Public License v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.project.facet.core/schemas/aliases.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.project.facet.core/schemas/aliases.exsd
@@ -130,7 +130,7 @@
       <documentation>
          Copyright (c) 2010 Oracle and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.project.facet.core/schemas/defaultFacets.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.project.facet.core/schemas/defaultFacets.exsd
@@ -214,7 +214,7 @@ facet-version-not-defined
       <documentation>
          Copyright (c) 2010 Oracle and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.project.facet.core/schemas/detectors.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.project.facet.core/schemas/detectors.exsd
@@ -92,7 +92,7 @@
       <documentation>
          Copyright (c) 2010 Oracle and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.project.facet.core/schemas/facets.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.project.facet.core/schemas/facets.exsd
@@ -767,7 +767,7 @@ group-not-defined
       <documentation>
          Copyright (c) 2010 Oracle and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
+are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
 &lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.project.facet.core/schemas/groups.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.project.facet.core/schemas/groups.exsd
@@ -195,7 +195,7 @@
       <documentation>
          Copyright (c) 2010 Oracle and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
+are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
 &lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.project.facet.core/schemas/listeners.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.project.facet.core/schemas/listeners.exsd
@@ -138,7 +138,7 @@ PRIMARY_RUNTIME_CHANGED
       <documentation>
          Copyright (c) 2010 Oracle and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
+are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
 &lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.project.facet.core/schemas/presets.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.project.facet.core/schemas/presets.exsd
@@ -205,7 +205,7 @@
       <documentation>
          Copyright (c) 2010 Oracle and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
+are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
 &lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.project.facet.core/schemas/runtimeBridges.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.project.facet.core/schemas/runtimeBridges.exsd
@@ -114,7 +114,7 @@
       <documentation>
          Copyright (c) 2010 Oracle and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.project.facet.core/schemas/runtimes.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.project.facet.core/schemas/runtimes.exsd
@@ -296,7 +296,7 @@
       <documentation>
          Copyright (c) 2010 Oracle and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.project.facet.core/schemas/validators.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.project.facet.core/schemas/validators.exsd
@@ -137,7 +137,7 @@
       <documentation>
          Copyright (c) 2010 Oracle and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.ui/about.html
+++ eclipse-wtp-3.18/org.eclipse.wst.common.ui/about.html
@@ -16,7 +16,7 @@
 
 <P>The Eclipse Foundation makes available all content in this plug-in 
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
+under the terms and conditions of the Eclipse Public License v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.ui/schema/exampleProjectCreationWizard.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.ui/schema/exampleProjectCreationWizard.exsd
@@ -234,7 +234,7 @@ There will be as many pages created for
       <documentation>
          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.uriresolver/about.html
+++ eclipse-wtp-3.18/org.eclipse.wst.common.uriresolver/about.html
@@ -16,7 +16,7 @@
 
 <P>The Eclipse Foundation makes available all content in this plug-in 
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
+under the terms and conditions of the Eclipse Public License v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.common.uriresolver/schema/resolverExtensions.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.common.uriresolver/schema/resolverExtensions.exsd
@@ -158,7 +158,7 @@ provides an URI resolver that resolves r
       <documentation>
          Copyright (c) 2000, 2008 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.validation.ui/about.html
+++ eclipse-wtp-3.18/org.eclipse.wst.validation.ui/about.html
@@ -16,7 +16,7 @@
 
 <P>The Eclipse Foundation makes available all content in this plug-in 
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
+under the terms and conditions of the Eclipse Public License v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.validation/about.html
+++ eclipse-wtp-3.18/org.eclipse.wst.validation/about.html
@@ -16,7 +16,7 @@
 
 <P>The Eclipse Foundation makes available all content in this plug-in 
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
+under the terms and conditions of the Eclipse Public License v2.0 
 ("EPL"). A copy of the EPL is available at
 <A href="https://www.eclipse.org/legal/epl-2.0/
 ">https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.validation/xsds/referencialFileExtSchema.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.validation/xsds/referencialFileExtSchema.exsd
@@ -109,7 +109,7 @@
       <documentation>
          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.validation/xsds/removeV2Validator.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.validation/xsds/removeV2Validator.exsd
@@ -114,7 +114,7 @@
       <documentation>
          Copyright (c) 2010 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.validation/xsds/validationHelper.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.validation/xsds/validationHelper.exsd
@@ -104,7 +104,7 @@
       <documentation>
          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.validation/xsds/validationSelectionHandler.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.validation/xsds/validationSelectionHandler.exsd
@@ -108,7 +108,7 @@
       <documentation>
          Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.validation/xsds/validator.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.validation/xsds/validator.exsd
@@ -439,7 +439,7 @@ By source id, we mean the id that is use
       <documentation>
          Copyright (c) 2007,2008 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.validation/xsds/validatorDelegates.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.validation/xsds/validatorDelegates.exsd
@@ -125,7 +125,7 @@ The target validator, the one who will d
       <documentation>
          Copyright (c) 2006 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.validation/xsds/validatorExtSchema.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.validation/xsds/validatorExtSchema.exsd
@@ -317,7 +317,7 @@ This markerId element also needs a corre
       <documentation>
          Copyright (c) 2005, 2010 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
--- eclipse-wtp-3.18.orig/org.eclipse.wst.validation/xsds/validatorgroup.exsd
+++ eclipse-wtp-3.18/org.eclipse.wst.validation/xsds/validatorgroup.exsd
@@ -152,7 +152,7 @@ public class org.eclipse.wst.validation.
       <documentation>
          Copyright (c) 2008 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License v2.0 which accompanies 
 this distribution, and is available at &lt;a
 href=&quot;https://www.eclipse.org/legal/epl-2.0/
 &quot;&gt;https://www.eclipse.org/legal/epl-2.0/
