[releng] Migrate to EPL 2.0.
diff --git a/doc/org.eclipse.xsd.cheatsheets/META-INF/MANIFEST.MF b/doc/org.eclipse.xsd.cheatsheets/META-INF/MANIFEST.MF
index dde8b00..f983285 100644
--- a/doc/org.eclipse.xsd.cheatsheets/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.xsd.cheatsheets/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.xsd.cheatsheets;singleton:=true
-Bundle-Version: 2.7.0.qualifier
+Bundle-Version: 2.8.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui.cheatsheets;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.cheatsheets;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.xsd.ecore.importer;bundle-version="[2.8.0,3.0.0)"
+ org.eclipse.xsd.ecore.importer;bundle-version="[2.9.0,3.0.0)"
diff --git a/doc/org.eclipse.xsd.cheatsheets/about.html b/doc/org.eclipse.xsd.cheatsheets/about.html
index 1b8f940..5ab4a4c 100644
--- a/doc/org.eclipse.xsd.cheatsheets/about.html
+++ b/doc/org.eclipse.xsd.cheatsheets/about.html
@@ -8,13 +8,13 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 5, 2007</p>	
+<p>November 22, 2017</p>	
 <h3>License</h3>
 
 <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="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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/doc/org.eclipse.xsd.cheatsheets/plugin.properties b/doc/org.eclipse.xsd.cheatsheets/plugin.properties
index 88519d2..940c101 100644
--- a/doc/org.eclipse.xsd.cheatsheets/plugin.properties
+++ b/doc/org.eclipse.xsd.cheatsheets/plugin.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2002-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  *
 #  * Contributors:
 #  *   IBM - Initial API and implementation
diff --git a/doc/org.eclipse.xsd.cheatsheets/pom.xml b/doc/org.eclipse.xsd.cheatsheets/pom.xml
index 7a87a82..6862ad9 100644
--- a/doc/org.eclipse.xsd.cheatsheets/pom.xml
+++ b/doc/org.eclipse.xsd.cheatsheets/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.xsd.cheatsheets</artifactId>
-  <version>2.7.0-SNAPSHOT</version>
+  <version>2.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/doc/org.eclipse.xsd.doc-feature/feature.properties b/doc/org.eclipse.xsd.doc-feature/feature.properties
index 7ac64b7..9e90905 100644
--- a/doc/org.eclipse.xsd.doc-feature/feature.properties
+++ b/doc/org.eclipse.xsd.doc-feature/feature.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2002-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  * 
 #  * Contributors: 
 #  *   IBM - Initial API and implementation
diff --git a/doc/org.eclipse.xsd.doc-feature/feature.xml b/doc/org.eclipse.xsd.doc-feature/feature.xml
index 50908ed..1d5e37b 100644
--- a/doc/org.eclipse.xsd.doc-feature/feature.xml
+++ b/doc/org.eclipse.xsd.doc-feature/feature.xml
@@ -2,21 +2,21 @@
 <feature
       id="org.eclipse.xsd.doc"
       label="%featureName"
-      version="2.10.0.qualifier"
+      version="2.11.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.xsd.license"
-      license-feature-version="2.9.0.qualifier">
+      license-feature-version="2.10.0">
 
    <description>
       %description
    </description>
 
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+   <copyright url="http://www.eclipse.org/legal/epl-v20.html">
       Copyright (c) 2002-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
+http://www.eclipse.org/legal/epl-v20.html
    </copyright>
 
    <license url="%licenseURL">
diff --git a/doc/org.eclipse.xsd.doc-feature/pom.xml b/doc/org.eclipse.xsd.doc-feature/pom.xml
index 004352b..bbf4730 100644
--- a/doc/org.eclipse.xsd.doc-feature/pom.xml
+++ b/doc/org.eclipse.xsd.doc-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.xsd.doc</artifactId>
-  <version>2.10.0-SNAPSHOT</version>
+  <version>2.11.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/doc/org.eclipse.xsd.doc/META-INF/MANIFEST.MF b/doc/org.eclipse.xsd.doc/META-INF/MANIFEST.MF
index c25c1e6..4a5d44a 100644
--- a/doc/org.eclipse.xsd.doc/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.xsd.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.xsd.doc; singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.help;bundle-version="[3.5.0,4.0.0)"
diff --git a/doc/org.eclipse.xsd.doc/about.html b/doc/org.eclipse.xsd.doc/about.html
index 1b8f940..5ab4a4c 100644
--- a/doc/org.eclipse.xsd.doc/about.html
+++ b/doc/org.eclipse.xsd.doc/about.html
@@ -8,13 +8,13 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 5, 2007</p>	
+<p>November 22, 2017</p>	
 <h3>License</h3>
 
 <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="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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/doc/org.eclipse.xsd.doc/about.properties b/doc/org.eclipse.xsd.doc/about.properties
index bb415b0..9dfd50b 100644
--- a/doc/org.eclipse.xsd.doc/about.properties
+++ b/doc/org.eclipse.xsd.doc/about.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2002-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  *
 #  * Contributors:
 #  *   IBM - Initial API and implementation
diff --git a/doc/org.eclipse.xsd.doc/build.properties b/doc/org.eclipse.xsd.doc/build.properties
index 45831e0..0c203f4 100644
--- a/doc/org.eclipse.xsd.doc/build.properties
+++ b/doc/org.eclipse.xsd.doc/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010 JBoss by Red Hat 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
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     JBoss by Red Hat - initial API and implementation
diff --git a/doc/org.eclipse.xsd.doc/plugin.properties b/doc/org.eclipse.xsd.doc/plugin.properties
index e46858b..f1d12b6 100644
--- a/doc/org.eclipse.xsd.doc/plugin.properties
+++ b/doc/org.eclipse.xsd.doc/plugin.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2002-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  *
 #  * Contributors:
 #  *   IBM - Initial API and implementation
diff --git a/doc/org.eclipse.xsd.doc/pom.xml b/doc/org.eclipse.xsd.doc/pom.xml
index 79a2727..cf71224 100644
--- a/doc/org.eclipse.xsd.doc/pom.xml
+++ b/doc/org.eclipse.xsd.doc/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.xsd.doc</artifactId>
-  <version>2.8.0-SNAPSHOT</version>
+  <version>2.9.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/examples/org.eclipse.xsd.example/META-INF/MANIFEST.MF b/examples/org.eclipse.xsd.example/META-INF/MANIFEST.MF
index f37a459..a8307da 100644
--- a/examples/org.eclipse.xsd.example/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.xsd.example/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.xsd.example; singleton:=true
-Bundle-Version: 2.7.0.qualifier
+Bundle-Version: 2.8.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/examples/org.eclipse.xsd.example/about.html b/examples/org.eclipse.xsd.example/about.html
index 1b8f940..5ab4a4c 100644
--- a/examples/org.eclipse.xsd.example/about.html
+++ b/examples/org.eclipse.xsd.example/about.html
@@ -8,13 +8,13 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 5, 2007</p>	
+<p>November 22, 2017</p>	
 <h3>License</h3>
 
 <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="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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/examples/org.eclipse.xsd.example/about.properties b/examples/org.eclipse.xsd.example/about.properties
index 5ce8dd0..9f1a53f 100644
--- a/examples/org.eclipse.xsd.example/about.properties
+++ b/examples/org.eclipse.xsd.example/about.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2002-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  *
 #  * Contributors:
 #  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.xsd.example/plugin.properties b/examples/org.eclipse.xsd.example/plugin.properties
index ced7d72..71fe0a8 100644
--- a/examples/org.eclipse.xsd.example/plugin.properties
+++ b/examples/org.eclipse.xsd.example/plugin.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2002-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  * 
 #  * Contributors: 
 #  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.xsd.example/pom.xml b/examples/org.eclipse.xsd.example/pom.xml
index 56f952e..5950262 100644
--- a/examples/org.eclipse.xsd.example/pom.xml
+++ b/examples/org.eclipse.xsd.example/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.xsd.example</artifactId>
-  <version>2.7.0-SNAPSHOT</version>
+  <version>2.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/examples/org.eclipse.xsd.example/src/org/eclipse/xsd/example/XSDGenerateHTML.java b/examples/org.eclipse.xsd.example/src/org/eclipse/xsd/example/XSDGenerateHTML.java
index cf77247..c553acf 100644
--- a/examples/org.eclipse.xsd.example/src/org/eclipse/xsd/example/XSDGenerateHTML.java
+++ b/examples/org.eclipse.xsd.example/src/org/eclipse/xsd/example/XSDGenerateHTML.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.xsd.example/src/org/eclipse/xsd/example/XSDMainExample.java b/examples/org.eclipse.xsd.example/src/org/eclipse/xsd/example/XSDMainExample.java
index 1a2e4dd..4a459be 100644
--- a/examples/org.eclipse.xsd.example/src/org/eclipse/xsd/example/XSDMainExample.java
+++ b/examples/org.eclipse.xsd.example/src/org/eclipse/xsd/example/XSDMainExample.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.xsd.example/src/org/eclipse/xsd/example/package.html b/examples/org.eclipse.xsd.example/src/org/eclipse/xsd/example/package.html
index 03a90e8..72f6451 100644
--- a/examples/org.eclipse.xsd.example/src/org/eclipse/xsd/example/package.html
+++ b/examples/org.eclipse.xsd.example/src/org/eclipse/xsd/example/package.html
@@ -6,9 +6,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/features/org.eclipse.xsd-feature/feature.properties b/features/org.eclipse.xsd-feature/feature.properties
index fa009f0..cc978ad 100644
--- a/features/org.eclipse.xsd-feature/feature.properties
+++ b/features/org.eclipse.xsd-feature/feature.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2002-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  * 
 #  * Contributors: 
 #  *   IBM - Initial API and implementation
diff --git a/features/org.eclipse.xsd-feature/feature.xml b/features/org.eclipse.xsd-feature/feature.xml
index 15354a6..7fe44e0 100644
--- a/features/org.eclipse.xsd-feature/feature.xml
+++ b/features/org.eclipse.xsd-feature/feature.xml
@@ -2,21 +2,21 @@
 <feature
       id="org.eclipse.xsd"
       label="%featureName"
-      version="2.14.0.qualifier"
+      version="2.15.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.xsd.license"
-      license-feature-version="2.9.0.qualifier">
+      license-feature-version="2.10.0">
 
    <description>
       %description
    </description>
 
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+   <copyright url="http://www.eclipse.org/legal/epl-v20.html">
       Copyright (c) 2002-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
+http://www.eclipse.org/legal/epl-v20.html
    </copyright>
 
    <license url="%licenseURL">
diff --git a/features/org.eclipse.xsd-feature/pom.xml b/features/org.eclipse.xsd-feature/pom.xml
index ab95865..c87a390 100644
--- a/features/org.eclipse.xsd-feature/pom.xml
+++ b/features/org.eclipse.xsd-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.xsd</artifactId>
-  <version>2.14.0-SNAPSHOT</version>
+  <version>2.15.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.xsd.ecore.converter-feature/feature.properties b/features/org.eclipse.xsd.ecore.converter-feature/feature.properties
index 9e81805..163758e 100644
--- a/features/org.eclipse.xsd.ecore.converter-feature/feature.properties
+++ b/features/org.eclipse.xsd.ecore.converter-feature/feature.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2007-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  * 
 #  * Contributors: 
 #  *   IBM - Initial API and implementation
diff --git a/features/org.eclipse.xsd.ecore.converter-feature/feature.xml b/features/org.eclipse.xsd.ecore.converter-feature/feature.xml
index 2be3b52..0269715 100644
--- a/features/org.eclipse.xsd.ecore.converter-feature/feature.xml
+++ b/features/org.eclipse.xsd.ecore.converter-feature/feature.xml
@@ -2,21 +2,21 @@
 <feature
       id="org.eclipse.xsd.ecore.converter"
       label="%featureName"
-      version="2.10.0.qualifier"
+      version="2.11.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.xsd.license"
-      license-feature-version="2.9.0.qualifier">
+      license-feature-version="2.10.0">
 
    <description>
       %description
    </description>
 
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+   <copyright url="http://www.eclipse.org/legal/epl-v20.html">
       Copyright (c) 2002-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
+http://www.eclipse.org/legal/epl-v20.html
    </copyright>
 
    <license url="%licenseURL">
diff --git a/features/org.eclipse.xsd.ecore.converter-feature/pom.xml b/features/org.eclipse.xsd.ecore.converter-feature/pom.xml
index 795a596..9d63d0b 100644
--- a/features/org.eclipse.xsd.ecore.converter-feature/pom.xml
+++ b/features/org.eclipse.xsd.ecore.converter-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.xsd.ecore.converter</artifactId>
-  <version>2.10.0-SNAPSHOT</version>
+  <version>2.11.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.xsd.edit-feature/feature.properties b/features/org.eclipse.xsd.edit-feature/feature.properties
index ebc0176..6140282 100644
--- a/features/org.eclipse.xsd.edit-feature/feature.properties
+++ b/features/org.eclipse.xsd.edit-feature/feature.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2007-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  * 
 #  * Contributors: 
 #  *   IBM - Initial API and implementation
diff --git a/features/org.eclipse.xsd.edit-feature/feature.xml b/features/org.eclipse.xsd.edit-feature/feature.xml
index cd104af..1b3030b 100644
--- a/features/org.eclipse.xsd.edit-feature/feature.xml
+++ b/features/org.eclipse.xsd.edit-feature/feature.xml
@@ -2,21 +2,21 @@
 <feature
       id="org.eclipse.xsd.edit"
       label="%featureName"
-      version="2.10.0.qualifier"
+      version="2.11.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.xsd.license"
-      license-feature-version="2.9.0.qualifier">
+      license-feature-version="2.10.0">
 
    <description>
       %description
    </description>
 
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+   <copyright url="http://www.eclipse.org/legal/epl-v20.html">
       Copyright (c) 2002-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
+http://www.eclipse.org/legal/epl-v20.html
    </copyright>
 
    <license url="%licenseURL">
diff --git a/features/org.eclipse.xsd.edit-feature/pom.xml b/features/org.eclipse.xsd.edit-feature/pom.xml
index ef94dec..31bd76b 100644
--- a/features/org.eclipse.xsd.edit-feature/pom.xml
+++ b/features/org.eclipse.xsd.edit-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.xsd.edit</artifactId>
-  <version>2.10.0-SNAPSHOT</version>
+  <version>2.11.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.xsd.editor-feature/feature.properties b/features/org.eclipse.xsd.editor-feature/feature.properties
index 1512fd3..5f8f921 100644
--- a/features/org.eclipse.xsd.editor-feature/feature.properties
+++ b/features/org.eclipse.xsd.editor-feature/feature.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2007-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  * 
 #  * Contributors: 
 #  *   IBM - Initial API and implementation
diff --git a/features/org.eclipse.xsd.editor-feature/feature.xml b/features/org.eclipse.xsd.editor-feature/feature.xml
index fb260a5..5fb9a89 100644
--- a/features/org.eclipse.xsd.editor-feature/feature.xml
+++ b/features/org.eclipse.xsd.editor-feature/feature.xml
@@ -2,21 +2,21 @@
 <feature
       id="org.eclipse.xsd.editor"
       label="%featureName"
-      version="2.11.0.qualifier"
+      version="2.12.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.xsd.license"
-      license-feature-version="2.9.0.qualifier">
+      license-feature-version="2.10.0">
 
    <description>
       %description
    </description>
 
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+   <copyright url="http://www.eclipse.org/legal/epl-v20.html">
       Copyright (c) 2002-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
+http://www.eclipse.org/legal/epl-v20.html
    </copyright>
 
    <license url="%licenseURL">
diff --git a/features/org.eclipse.xsd.editor-feature/pom.xml b/features/org.eclipse.xsd.editor-feature/pom.xml
index 1c5cb09..80ec378 100644
--- a/features/org.eclipse.xsd.editor-feature/pom.xml
+++ b/features/org.eclipse.xsd.editor-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.xsd.editor</artifactId>
-  <version>2.11.0-SNAPSHOT</version>
+  <version>2.12.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.xsd.example-feature/feature.properties b/features/org.eclipse.xsd.example-feature/feature.properties
index 26200b8..84058c1 100644
--- a/features/org.eclipse.xsd.example-feature/feature.properties
+++ b/features/org.eclipse.xsd.example-feature/feature.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2007-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  * 
 #  * Contributors: 
 #  *   IBM - Initial API and implementation
diff --git a/features/org.eclipse.xsd.example-feature/feature.xml b/features/org.eclipse.xsd.example-feature/feature.xml
index 836eeed..b9044ec 100644
--- a/features/org.eclipse.xsd.example-feature/feature.xml
+++ b/features/org.eclipse.xsd.example-feature/feature.xml
@@ -2,21 +2,21 @@
 <feature
       id="org.eclipse.xsd.example"
       label="%featureName"
-      version="2.9.0.qualifier"
+      version="2.10.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.xsd.license"
-      license-feature-version="2.9.0.qualifier">
+      license-feature-version="2.10.0">
 
    <description>
       %description
    </description>
 
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+   <copyright url="http://www.eclipse.org/legal/epl-v20.html">
       Copyright (c) 2002-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
+http://www.eclipse.org/legal/epl-v20.html
    </copyright>
 
    <license url="%licenseURL">
diff --git a/features/org.eclipse.xsd.example-feature/pom.xml b/features/org.eclipse.xsd.example-feature/pom.xml
index a6c4358..ca4c445 100644
--- a/features/org.eclipse.xsd.example-feature/pom.xml
+++ b/features/org.eclipse.xsd.example-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.xsd.example</artifactId>
-  <version>2.9.0-SNAPSHOT</version>
+  <version>2.10.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.xsd.license-feature/build.properties b/features/org.eclipse.xsd.license-feature/build.properties
index 469bca2..f39b293 100644
--- a/features/org.eclipse.xsd.license-feature/build.properties
+++ b/features/org.eclipse.xsd.license-feature/build.properties
@@ -1,8 +1,7 @@
 bin.includes = feature.xml,\
                feature.properties,\
-               epl-v10.html,\
+               epl-2.0.html,\
                license.html,\
                build.properties
-src.includes = epl-v10.html,\
+src.includes = epl-2.0.html,\
                license.html
-root=rootfiles
diff --git a/features/org.eclipse.xsd.license-feature/epl-2.0.html b/features/org.eclipse.xsd.license-feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.xsd.license-feature/epl-2.0.html
@@ -0,0 +1,300 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Eclipse Public License - Version 2.0</title>
+    <style type="text/css">
+      body {
+        margin: 1.5em 3em;
+      }
+      h1{
+        font-size:1.5em;
+      }
+      h2{
+        font-size:1em;
+        margin-bottom:0.5em;
+        margin-top:1em;
+      }
+      p {
+        margin-top:  0.5em;
+        margin-bottom: 0.5em;
+      }
+      ul, ol{
+        list-style-type:none;
+      }
+    </style>
+  </head>
+  <body>
+    <h1>Eclipse Public License - v 2.0</h1>
+    <p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+      PUBLIC LICENSE (&ldquo;AGREEMENT&rdquo;). ANY USE, REPRODUCTION OR DISTRIBUTION
+      OF THE PROGRAM CONSTITUTES RECIPIENT&#039;S ACCEPTANCE OF THIS AGREEMENT.
+    </p>
+    <h2 id="definitions">1. DEFINITIONS</h2>
+    <p>&ldquo;Contribution&rdquo; means:</p>
+    <ul>
+      <li>a) in the case of the initial Contributor, the initial content
+        Distributed under this Agreement, and
+      </li>
+      <li>
+        b) in the case of each subsequent Contributor:
+        <ul>
+          <li>i) changes to the Program, and</li>
+          <li>ii) additions to the Program;</li>
+        </ul>
+        where such changes and/or additions to the Program originate from
+        and are Distributed by that particular Contributor. A Contribution
+        &ldquo;originates&rdquo; from a Contributor if it was added to the Program by such
+        Contributor itself or anyone acting on such Contributor&#039;s behalf.
+        Contributions do not include changes or additions to the Program that
+        are not Modified Works.
+      </li>
+    </ul>
+    <p>&ldquo;Contributor&rdquo; means any person or entity that Distributes the Program.</p>
+    <p>&ldquo;Licensed Patents&rdquo; mean patent claims licensable by a Contributor which
+      are necessarily infringed by the use or sale of its Contribution alone
+      or when combined with the Program.
+    </p>
+    <p>&ldquo;Program&rdquo; means the Contributions Distributed in accordance with this
+      Agreement.
+    </p>
+    <p>&ldquo;Recipient&rdquo; means anyone who receives the Program under this Agreement
+      or any Secondary License (as applicable), including Contributors.
+    </p>
+    <p>&ldquo;Derivative Works&rdquo; shall mean any work, whether in Source Code or other
+      form, that is based on (or derived from) the Program and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship.
+    </p>
+    <p>&ldquo;Modified Works&rdquo; shall mean any work in Source Code or other form that
+      results from an addition to, deletion from, or modification of the
+      contents of the Program, including, for purposes of clarity any new file
+      in Source Code form that contains any contents of the Program. Modified
+      Works shall not include works that contain only declarations, interfaces,
+      types, classes, structures, or files of the Program solely in each case
+      in order to link to, bind by name, or subclass the Program or Modified
+      Works thereof.
+    </p>
+    <p>&ldquo;Distribute&rdquo; means the acts of a) distributing or b) making available
+      in any manner that enables the transfer of a copy.
+    </p>
+    <p>&ldquo;Source Code&rdquo; means the form of a Program preferred for making
+      modifications, including but not limited to software source code,
+      documentation source, and configuration files.
+    </p>
+    <p>&ldquo;Secondary License&rdquo; means either the GNU General Public License,
+      Version 2.0, or any later versions of that license, including any
+      exceptions or additional permissions as identified by the initial
+      Contributor.
+    </p>
+    <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2>
+    <ul>
+      <li>a) Subject to the terms of this Agreement, each Contributor hereby
+        grants Recipient a non-exclusive, worldwide, royalty-free copyright
+        license to reproduce, prepare Derivative Works of, publicly display,
+        publicly perform, Distribute and sublicense the Contribution of such
+        Contributor, if any, and such Derivative Works.
+      </li>
+      <li>b) Subject to the terms of this Agreement, each Contributor hereby
+        grants Recipient a non-exclusive, worldwide, royalty-free patent
+        license under Licensed Patents to make, use, sell, offer to sell,
+        import and otherwise transfer the Contribution of such Contributor,
+        if any, in Source Code or other form. This patent license shall
+        apply to the combination of the Contribution and the Program if,
+        at the time the Contribution is added by the Contributor, such
+        addition of the Contribution causes such combination to be covered
+        by the Licensed Patents. The patent license shall not apply to any
+        other combinations which include the Contribution. No hardware per
+        se is licensed hereunder.
+      </li>
+      <li>c) Recipient understands that although each Contributor grants the
+        licenses to its Contributions set forth herein, no assurances are
+        provided by any Contributor that the Program does not infringe the
+        patent or other intellectual property rights of any other entity.
+        Each Contributor disclaims any liability to Recipient for claims
+        brought by any other entity based on infringement of intellectual
+        property rights or otherwise. As a condition to exercising the rights
+        and licenses granted hereunder, each Recipient hereby assumes sole
+        responsibility to secure any other intellectual property rights needed,
+        if any. For example, if a third party patent license is required to
+        allow Recipient to Distribute the Program, it is Recipient&#039;s
+        responsibility to acquire that license before distributing the Program.
+      </li>
+      <li>d) Each Contributor represents that to its knowledge it has sufficient
+        copyright rights in its Contribution, if any, to grant the copyright
+        license set forth in this Agreement.
+      </li>
+      <li>e) Notwithstanding the terms of any Secondary License, no Contributor
+        makes additional grants to any Recipient (other than those set forth
+        in this Agreement) as a result of such Recipient&#039;s receipt of the
+        Program under the terms of a Secondary License (if permitted under
+        the terms of Section 3).
+      </li>
+    </ul>
+    <h2 id="requirements">3. REQUIREMENTS</h2>
+    <p>3.1 If a Contributor Distributes the Program in any form, then:</p>
+    <ul>
+      <li>a) the Program must also be made available as Source Code, in
+        accordance with section 3.2, and the Contributor must accompany
+        the Program with a statement that the Source Code for the Program
+        is available under this Agreement, and informs Recipients how to
+        obtain it in a reasonable manner on or through a medium customarily
+        used for software exchange; and
+      </li>
+      <li>
+        b) the Contributor may Distribute the Program under a license
+        different than this Agreement, provided that such license:
+        <ul>
+          <li>i) effectively disclaims on behalf of all other Contributors all
+            warranties and conditions, express and implied, including warranties
+            or conditions of title and non-infringement, and implied warranties
+            or conditions of merchantability and fitness for a particular purpose;
+          </li>
+          <li>ii) effectively excludes on behalf of all other Contributors all
+            liability for damages, including direct, indirect, special, incidental
+            and consequential damages, such as lost profits;
+          </li>
+          <li>iii) does not attempt to limit or alter the recipients&#039; rights in the
+            Source Code under section 3.2; and
+          </li>
+          <li>iv) requires any subsequent distribution of the Program by any party
+            to be under a license that satisfies the requirements of this section 3.
+          </li>
+        </ul>
+      </li>
+    </ul>
+    <p>3.2 When the Program is Distributed as Source Code:</p>
+    <ul>
+      <li>a) it must be made available under this Agreement, or if the Program (i)
+        is combined with other material in a separate file or files made available
+        under a Secondary License, and (ii) the initial Contributor attached to
+        the Source Code the notice described in Exhibit A of this Agreement,
+        then the Program may be made available under the terms of such
+        Secondary Licenses, and
+      </li>
+      <li>b) a copy of this Agreement must be included with each copy of the Program.</li>
+    </ul>
+    <p>3.3 Contributors may not remove or alter any copyright, patent, trademark,
+      attribution notices, disclaimers of warranty, or limitations of liability
+      (&lsquo;notices&rsquo;) contained within the Program from any copy of the Program which
+      they Distribute, provided that Contributors may add their own appropriate
+      notices.
+    </p>
+    <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2>
+    <p>Commercial distributors of software may accept certain responsibilities
+      with respect to end users, business partners and the like. While this
+      license is intended to facilitate the commercial use of the Program, the
+      Contributor who includes the Program in a commercial product offering should
+      do so in a manner which does not create potential liability for other
+      Contributors. Therefore, if a Contributor includes the Program in a
+      commercial product offering, such Contributor (&ldquo;Commercial Contributor&rdquo;)
+      hereby agrees to defend and indemnify every other Contributor
+      (&ldquo;Indemnified Contributor&rdquo;) against any losses, damages and costs
+      (collectively &ldquo;Losses&rdquo;) arising from claims, lawsuits and other legal actions
+      brought by a third party against the Indemnified Contributor to the extent
+      caused by the acts or omissions of such Commercial Contributor in connection
+      with its distribution of the Program in a commercial product offering.
+      The obligations in this section do not apply to any claims or Losses relating
+      to any actual or alleged intellectual property infringement. In order to
+      qualify, an Indemnified Contributor must: a) promptly notify the
+      Commercial Contributor in writing of such claim, and b) allow the Commercial
+      Contributor to control, and cooperate with the Commercial Contributor in,
+      the defense and any related settlement negotiations. The Indemnified
+      Contributor may participate in any such claim at its own expense.
+    </p>
+    <p>For example, a Contributor might include the Program
+      in a commercial product offering, Product X. That Contributor is then a
+      Commercial Contributor. If that Commercial Contributor then makes performance
+      claims, or offers warranties related to Product X, those performance claims
+      and warranties are such Commercial Contributor&#039;s responsibility alone.
+      Under this section, the Commercial Contributor would have to defend claims
+      against the other Contributors related to those performance claims and
+      warranties, and if a court requires any other Contributor to pay any damages
+      as a result, the Commercial Contributor must pay those damages.
+    </p>
+    <h2 id="warranty">5. NO WARRANTY</h2>
+    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+      BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN &ldquo;AS IS&rdquo; BASIS, WITHOUT
+      WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+      WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+      MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is
+      solely responsible for determining the appropriateness of using and
+      distributing the Program and assumes all risks associated with its
+      exercise of rights under this Agreement, including but not limited to the
+      risks and costs of program errors, compliance with applicable laws, damage
+      to or loss of data, programs or equipment, and unavailability or
+      interruption of operations.
+    </p>
+    <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2>
+    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+      BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY
+      LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+      OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
+      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+      LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+      OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+      GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+    </p>
+    <h2 id="general">7. GENERAL</h2>
+    <p>If any provision of this Agreement is invalid or unenforceable under
+      applicable law, it shall not affect the validity or enforceability of the
+      remainder of the terms of this Agreement, and without further action by the
+      parties hereto, such provision shall be reformed to the minimum extent
+      necessary to make such provision valid and enforceable.
+    </p>
+    <p>If Recipient institutes patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+      (excluding combinations of the Program with other software or hardware)
+      infringes such Recipient&#039;s patent(s), then such Recipient&#039;s rights granted
+      under Section 2(b) shall terminate as of the date such litigation is filed.
+    </p>
+    <p>All Recipient&#039;s rights under this Agreement shall terminate if it fails to
+      comply with any of the material terms or conditions of this Agreement and
+      does not cure such failure in a reasonable period of time after becoming
+      aware of such noncompliance. If all Recipient&#039;s rights under this Agreement
+      terminate, Recipient agrees to cease use and distribution of the Program
+      as soon as reasonably practicable. However, Recipient&#039;s obligations under
+      this Agreement and any licenses granted by Recipient relating to the
+      Program shall continue and survive.
+    </p>
+    <p>Everyone is permitted to copy and distribute copies of this Agreement,
+      but in order to avoid inconsistency the Agreement is copyrighted and may
+      only be modified in the following manner. The Agreement Steward reserves
+      the right to publish new versions (including revisions) of this Agreement
+      from time to time. No one other than the Agreement Steward has the right
+      to modify this Agreement. The Eclipse Foundation is the initial Agreement
+      Steward. The Eclipse Foundation may assign the responsibility to serve as
+      the Agreement Steward to a suitable separate entity. Each new version of
+      the Agreement will be given a distinguishing version number. The Program
+      (including Contributions) may always be Distributed subject to the version
+      of the Agreement under which it was received. In addition, after a new
+      version of the Agreement is published, Contributor may elect to Distribute
+      the Program (including its Contributions) under the new version.
+    </p>
+    <p>Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+      receives no rights or licenses to the intellectual property of any
+      Contributor under this Agreement, whether expressly, by implication,
+      estoppel or otherwise. All rights in the Program not expressly granted
+      under this Agreement are reserved. Nothing in this Agreement is intended
+      to be enforceable by any entity that is not a Contributor or Recipient.
+      No third-party beneficiary rights are created under this Agreement.
+    </p>
+    <h2 id="exhibit-a">Exhibit A &ndash; Form of Secondary Licenses Notice</h2>
+    <p>&ldquo;This Source Code may also be made available under the following 
+    	Secondary Licenses when the conditions for such availability set forth 
+    	in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+    	version(s), and exceptions or additional permissions here}.&rdquo;
+    </p>
+    <blockquote>
+      <p>Simply including a copy of this Agreement, including this Exhibit A
+        is not sufficient to license the Source Code under Secondary Licenses.
+      </p>
+      <p>If it is not possible or desirable to put the notice in a particular file,
+        then You may include the notice in a location (such as a LICENSE file in a
+        relevant directory) where a recipient would be likely to look for
+        such a notice.
+      </p>
+      <p>You may add additional accurate notices of copyright ownership.</p>
+    </blockquote>
+  </body>
+</html>
\ No newline at end of file
diff --git a/features/org.eclipse.xsd.license-feature/epl-v10.html b/features/org.eclipse.xsd.license-feature/epl-v10.html
deleted file mode 100755
index 3998fce..0000000
--- a/features/org.eclipse.xsd.license-feature/epl-v10.html
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Public License - Version 1.0</title>
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style>
-
-</head>
-
-<body lang="EN-US">
-
-<h2>Eclipse Public License - v 1.0</h2>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>&quot;Contribution&quot; means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>&quot;Contributor&quot; means any person or entity that distributes
-the Program.</p>
-
-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>&quot;Program&quot; means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>&quot;Recipient&quot; means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-(&quot;Commercial Contributor&quot;) hereby agrees to defend and
-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
-against any losses, damages and costs (collectively &quot;Losses&quot;)
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.xsd.license-feature/feature.properties b/features/org.eclipse.xsd.license-feature/feature.properties
index 6fec029..03cbdc6 100755
--- a/features/org.eclipse.xsd.license-feature/feature.properties
+++ b/features/org.eclipse.xsd.license-feature/feature.properties
@@ -6,125 +6,143 @@
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-April 9, 2014\n\
+\n\
+November 22, 2017\n\
 \n\
 Usage Of Content\n\
 \n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\
+THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\
+TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\
+BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\
+MAY NOT USE THE CONTENT.\n\
 \n\
 Applicable Licenses\n\
 \n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public License\n\
+Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\
+"Program" will mean the Content.\n\
 \n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
+Content includes, but is not limited to, source code, object code, documentation\n\
+and other files maintained in the Eclipse Foundation source code repository\n\
+("Repository") in software modules ("Modules") and made available as\n\
+downloadable archives ("Downloads").\n\
 \n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+-   Content may be structured and packaged into modules to facilitate\n\
+    delivering, extending, and upgrading the Content. Typical modules may\n\
+    include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\
+    features ("Features").\n\
+-   Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
+    (Java\u2122 ARchive) in a directory named "plugins".\n\
+-   A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\
+    associated material. Each Feature may be packaged as a sub-directory in a\n\
+    directory named "features". Within a Feature, files named "feature.xml" may\n\
+    contain a list of the names and version numbers of the Plug-ins and/or\n\
+    Fragments associated with that Feature.\n\
+-   Features may also include other Features ("Included Features"). Within a\n\
+    Feature, files named "feature.xml" may contain a list of the names and\n\
+    version numbers of Included Features.\n\
 \n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
+The terms and conditions governing Plug-ins and Fragments should be contained in\n\
+files named "about.html" ("Abouts"). The terms and conditions governing Features\n\
+and Included Features should be contained in files named "license.html"\n\
+("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\
+directory of a Download or Module including, but not limited to the following\n\
+locations:\n\
 \n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
+-   The top-level (root) directory\n\
+-   Plug-in and Fragment directories\n\
+-   Inside Plug-ins and Fragments packaged as JARs\n\
+-   Sub-directories of the directory named "src" of certain Plug-ins\n\
+-   Feature directories\n\
 \n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using\n\
+the Provisioning Technology (as defined below), you must agree to a license\n\
+("Feature Update License") during the installation process. If the Feature\n\
+contains Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform you\n\
+where you can locate them. Feature Update Licenses may be found in the "license"\n\
+property of files named "feature.properties" found within a Feature. Such\n\
+Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your use of\n\
+the associated Content in that directory.\n\
 \n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\
+OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
 \n\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+-   Eclipse Public License Version 1.0 (available at\n\
+    http://www.eclipse.org/legal/epl-v20.html)\n\
+-   Eclipse Distribution License Version 1.0 (available at\n\
+    http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+-   Common Public License Version 1.0 (available at\n\
+    http://www.eclipse.org/legal/cpl-v10.html)\n\
+-   Apache Software License 1.1 (available at\n\
+    http://www.apache.org/licenses/LICENSE)\n\
+-   Apache Software License 2.0 (available at\n\
+    http://www.apache.org/licenses/LICENSE-2.0)\n\
+-   Mozilla Public License Version 1.1 (available at\n\
+    http://www.mozilla.org/MPL/MPL-1.1.html)\n\
 \n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO\n\
+USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\
+provided, please contact the Eclipse Foundation to determine what terms and\n\
+conditions govern that particular Content.\n\
 \n\
-\n\Use of Provisioning Technology\n\
+Use of Provisioning Technology\n\
 \n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
+The Eclipse Foundation makes available provisioning software, examples of which\n\
+include, but are not limited to, p2 and the Eclipse Update Manager\n\
+("Provisioning Technology") for the purpose of allowing users to install\n\
+software, documentation, information and/or other materials (collectively\n\
+"Installable Software"). This capability is provided with the intent of allowing\n\
+such users to install, extend and update Eclipse-based products. Information\n\
+about packaging Installable Software is available at\n\
 http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
 \n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
+You may use Provisioning Technology to allow other parties to install\n\
+Installable Software. You shall be responsible for enabling the applicable\n\
+license agreements relating to the Installable Software to be presented to, and\n\
+accepted by, the users of the Provisioning Technology in accordance with the\n\
+Specification. By using Provisioning Technology in such a manner and making it\n\
+available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the\n\
+following:\n\
 \n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
+1.  A series of actions may occur ("Provisioning Process") in which a user may\n\
+    execute the Provisioning Technology on a machine ("Target Machine") with the\n\
+    intent of installing, extending or updating the functionality of an\n\
+    Eclipse-based product.\n\
+2.  During the Provisioning Process, the Provisioning Technology may cause third\n\
+    party Installable Software or a portion thereof to be accessed and copied to\n\
+    the Target Machine.\n\
+3.  Pursuant to the Specification, you will provide to the user the terms and\n\
+    conditions that govern the use of the Installable Software ("Installable\n\
+    Software Agreement") and such Installable Software Agreement shall be\n\
+    accessed from the Target Machine in accordance with the Specification. Such\n\
+    Installable Software Agreement must inform the user of the terms and\n\
+    conditions that govern the Installable Software and must solicit acceptance\n\
+    by the end user in the manner prescribed in such Installable\n\
+    Software Agreement. Upon such indication of agreement by the user, the\n\
+    provisioning Technology will complete installation of the\n\
+    Installable Software.\n\
 \n\
 Cryptography\n\
 \n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
+Content may contain encryption software. The country in which you are currently\n\
+may have restrictions on the import, possession, and use, and/or re-export to\n\
+another country, of encryption software. BEFORE using any encryption software,\n\
+please check the country's laws, regulations and policies concerning the import,\n\
+possession, or use, and re-export of encryption software, to see if this is\n\
+permitted.\n\
 \n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\
+United States, other countries, or both.\n
 ########### end of license property ##########################################
diff --git a/features/org.eclipse.xsd.license-feature/feature.xml b/features/org.eclipse.xsd.license-feature/feature.xml
index 2c154f8..ad04bcd 100644
--- a/features/org.eclipse.xsd.license-feature/feature.xml
+++ b/features/org.eclipse.xsd.license-feature/feature.xml
@@ -2,19 +2,19 @@
 <feature
       id="org.eclipse.xsd.license"
       label="XSD License"
-      version="2.9.0.qualifier"
+      version="2.10.0.qualifier"
       provider-name="Eclipse Modeling Project">
 
    <description>
       License for XML Schema Definition.
    </description>
    
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+   <copyright url="http://www.eclipse.org/legal/epl-v20.html">
       Copyright (c) 2014-2018 Eclipse contributors 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
+http://www.eclipse.org/legal/epl-v20.html
    </copyright>
    
    <license url="%licenseURL">
diff --git a/features/org.eclipse.xsd.license-feature/license.html b/features/org.eclipse.xsd.license-feature/license.html
index c3d34c3..0da3c7e 100644
--- a/features/org.eclipse.xsd.license-feature/license.html
+++ b/features/org.eclipse.xsd.license-feature/license.html
@@ -7,101 +7,183 @@
 </head>
 
 <body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 9, 2014</p>
+	<h2>Eclipse Foundation Software User Agreement</h2>
+	<p>November 22, 2017</p>
 
-<h3>Usage Of Content</h3>
+	<h3>Usage Of Content</h3>
 
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+	<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
+		INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+		(COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY
+		THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+		CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+		BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS
+		GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY
+		APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+		BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
+		AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
+		AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
+		USE THE CONTENT.</p>
 
-<h3>Applicable Licenses</h3>
+	<h3>Applicable Licenses</h3>
 
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>
+		Unless otherwise indicated, all Content made available by the Eclipse
+		Foundation is provided to you under the terms and conditions of the
+		Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the
+		EPL is provided with this Content and is also available at <a
+			href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
 
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+	<p>Content includes, but is not limited to, source code, object
+		code, documentation and other files maintained in the Eclipse
+		Foundation source code repository (&quot;Repository&quot;) in software
+		modules (&quot;Modules&quot;) and made available as downloadable
+		archives (&quot;Downloads&quot;).</p>
 
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
+	<ul>
+		<li>Content may be structured and packaged into modules to
+			facilitate delivering, extending, and upgrading the Content. Typical
+			modules may include plug-ins (&quot;Plug-ins&quot;), plug-in
+			fragments (&quot;Fragments&quot;), and features
+			(&quot;Features&quot;).</li>
+		<li>Each Plug-in or Fragment may be packaged as a sub-directory
+			or JAR (Java&trade; ARchive) in a directory named
+			&quot;plugins&quot;.</li>
+		<li>A Feature is a bundle of one or more Plug-ins and/or
+			Fragments and associated material. Each Feature may be packaged as a
+			sub-directory in a directory named &quot;features&quot;. Within a
+			Feature, files named &quot;feature.xml&quot; may contain a list of
+			the names and version numbers of the Plug-ins and/or Fragments
+			associated with that Feature.</li>
+		<li>Features may also include other Features (&quot;Included
+			Features&quot;). Within a Feature, files named
+			&quot;feature.xml&quot; may contain a list of the names and version
+			numbers of Included Features.</li>
+	</ul>
 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
+	<p>The terms and conditions governing Plug-ins and Fragments should
+		be contained in files named &quot;about.html&quot;
+		(&quot;Abouts&quot;). The terms and conditions governing Features and
+		Included Features should be contained in files named
+		&quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and
+		Feature Licenses may be located in any directory of a Download or
+		Module including, but not limited to the following locations:</p>
 
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
+	<ul>
+		<li>The top-level (root) directory</li>
+		<li>Plug-in and Fragment directories</li>
+		<li>Inside Plug-ins and Fragments packaged as JARs</li>
+		<li>Sub-directories of the directory named &quot;src&quot; of
+			certain Plug-ins</li>
+		<li>Feature directories</li>
+	</ul>
 
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
+	<p>Note: if a Feature made available by the Eclipse Foundation is
+		installed using the Provisioning Technology (as defined below), you
+		must agree to a license (&quot;Feature Update License&quot;) during
+		the installation process. If the Feature contains Included Features,
+		the Feature Update License should either provide you with the terms
+		and conditions governing the Included Features or inform you where you
+		can locate them. Feature Update Licenses may be found in the
+		&quot;license&quot; property of files named
+		&quot;feature.properties&quot; found within a Feature. Such Abouts,
+		Feature Licenses, and Feature Update Licenses contain the terms and
+		conditions (or references to such terms and conditions) that govern
+		your use of the associated Content in that directory.</p>
 
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+	<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY
+		REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
+		CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT
+		ARE NOT LIMITED TO):</p>
 
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
+	<ul>
+		<li>Eclipse Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>)
+		</li>
+		<li>Eclipse Distribution License Version 1.0 (available at <a
+			href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)
+		</li>
+		<li>Common Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)
+		</li>
+		<li>Apache Software License 1.1 (available at <a
+			href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)
+		</li>
+		<li>Apache Software License 2.0 (available at <a
+			href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)
+		</li>
+		<li>Mozilla Public License Version 1.1 (available at <a
+			href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)
+		</li>
+	</ul>
 
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+	<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
+		CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
+		or Feature Update License is provided, please contact the Eclipse
+		Foundation to determine what terms and conditions govern that
+		particular Content.</p>
 
 
-<h3>Use of Provisioning Technology</h3>
+	<h3>Use of Provisioning Technology</h3>
 
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
+	<p>
+		The Eclipse Foundation makes available provisioning software, examples
+		of which include, but are not limited to, p2 and the Eclipse Update
+		Manager (&quot;Provisioning Technology&quot;) for the purpose of
+		allowing users to install software, documentation, information and/or
+		other materials (collectively &quot;Installable Software&quot;). This
+		capability is provided with the intent of allowing such users to
+		install, extend and update Eclipse-based products. Information about
+		packaging Installable Software is available at <a
+			href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+		(&quot;Specification&quot;).
+	</p>
 
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+	<p>You may use Provisioning Technology to allow other parties to
+		install Installable Software. You shall be responsible for enabling
+		the applicable license agreements relating to the Installable Software
+		to be presented to, and accepted by, the users of the Provisioning
+		Technology in accordance with the Specification. By using Provisioning
+		Technology in such a manner and making it available in accordance with
+		the Specification, you further acknowledge your agreement to, and the
+		acquisition of all necessary rights to permit the following:</p>
 
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
+	<ol>
+		<li>A series of actions may occur (&quot;Provisioning
+			Process&quot;) in which a user may execute the Provisioning
+			Technology on a machine (&quot;Target Machine&quot;) with the intent
+			of installing, extending or updating the functionality of an
+			Eclipse-based product.</li>
+		<li>During the Provisioning Process, the Provisioning Technology
+			may cause third party Installable Software or a portion thereof to be
+			accessed and copied to the Target Machine.</li>
+		<li>Pursuant to the Specification, you will provide to the user
+			the terms and conditions that govern the use of the Installable
+			Software (&quot;Installable Software Agreement&quot;) and such
+			Installable Software Agreement shall be accessed from the Target
+			Machine in accordance with the Specification. Such Installable
+			Software Agreement must inform the user of the terms and conditions
+			that govern the Installable Software and must solicit acceptance by
+			the end user in the manner prescribed in such Installable Software
+			Agreement. Upon such indication of agreement by the user, the
+			provisioning Technology will complete installation of the Installable
+			Software.</li>
+	</ol>
 
-<h3>Cryptography</h3>
+	<h3>Cryptography</h3>
 
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+	<p>Content may contain encryption software. The country in which
+		you are currently may have restrictions on the import, possession, and
+		use, and/or re-export to another country, of encryption software.
+		BEFORE using any encryption software, please check the country's laws,
+		regulations and policies concerning the import, possession, or use,
+		and re-export of encryption software, to see if this is permitted.</p>
 
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+	<p>
+		<small>Java and all Java-based trademarks are trademarks of
+			Oracle Corporation in the United States, other countries, or both.</small>
+	</p>
 </body>
 </html>
diff --git a/features/org.eclipse.xsd.license-feature/pom.xml b/features/org.eclipse.xsd.license-feature/pom.xml
index b1c8d0e..27be69b 100644
--- a/features/org.eclipse.xsd.license-feature/pom.xml
+++ b/features/org.eclipse.xsd.license-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.xsd.license</artifactId>
-  <version>2.9.0-SNAPSHOT</version>
+  <version>2.10.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.xsd.license-feature/rootfiles/epl-v10.html b/features/org.eclipse.xsd.license-feature/rootfiles/epl-v10.html
deleted file mode 100755
index 3998fce..0000000
--- a/features/org.eclipse.xsd.license-feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Public License - Version 1.0</title>
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style>
-
-</head>
-
-<body lang="EN-US">
-
-<h2>Eclipse Public License - v 1.0</h2>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>&quot;Contribution&quot; means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>&quot;Contributor&quot; means any person or entity that distributes
-the Program.</p>
-
-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>&quot;Program&quot; means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>&quot;Recipient&quot; means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-(&quot;Commercial Contributor&quot;) hereby agrees to defend and
-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
-against any losses, damages and costs (collectively &quot;Losses&quot;)
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.xsd.license-feature/rootfiles/notice.html b/features/org.eclipse.xsd.license-feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.xsd.license-feature/rootfiles/notice.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 9, 2014</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/features/org.eclipse.xsd.mapping-feature/feature.properties b/features/org.eclipse.xsd.mapping-feature/feature.properties
index 8e93cc1..62bb339 100644
--- a/features/org.eclipse.xsd.mapping-feature/feature.properties
+++ b/features/org.eclipse.xsd.mapping-feature/feature.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2007-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  * 
 #  * Contributors: 
 #  *   IBM - Initial API and implementation
diff --git a/features/org.eclipse.xsd.mapping-feature/feature.xml b/features/org.eclipse.xsd.mapping-feature/feature.xml
index 593f7a4..75abcc8 100644
--- a/features/org.eclipse.xsd.mapping-feature/feature.xml
+++ b/features/org.eclipse.xsd.mapping-feature/feature.xml
@@ -2,21 +2,21 @@
 <feature
       id="org.eclipse.xsd.mapping"
       label="%featureName"
-      version="2.10.0.qualifier"
+      version="2.11.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.xsd.license"
-      license-feature-version="2.9.0.qualifier">
+      license-feature-version="2.10.0">
 
    <description>
       %description
    </description>
 
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+   <copyright url="http://www.eclipse.org/legal/epl-v20.html">
       Copyright (c) 2002-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
+http://www.eclipse.org/legal/epl-v20.html
    </copyright>
 
    <license url="%licenseURL">
diff --git a/features/org.eclipse.xsd.mapping-feature/pom.xml b/features/org.eclipse.xsd.mapping-feature/pom.xml
index 65ffb57..7754497 100644
--- a/features/org.eclipse.xsd.mapping-feature/pom.xml
+++ b/features/org.eclipse.xsd.mapping-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.xsd.mapping</artifactId>
-  <version>2.10.0-SNAPSHOT</version>
+  <version>2.11.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.xsd.mapping.editor-feature/feature.properties b/features/org.eclipse.xsd.mapping.editor-feature/feature.properties
index 679bb0a..63aa0f1 100644
--- a/features/org.eclipse.xsd.mapping.editor-feature/feature.properties
+++ b/features/org.eclipse.xsd.mapping.editor-feature/feature.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2007-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  * 
 #  * Contributors: 
 #  *   IBM - Initial API and implementation
diff --git a/features/org.eclipse.xsd.mapping.editor-feature/feature.xml b/features/org.eclipse.xsd.mapping.editor-feature/feature.xml
index 0822d93..3ac8466 100644
--- a/features/org.eclipse.xsd.mapping.editor-feature/feature.xml
+++ b/features/org.eclipse.xsd.mapping.editor-feature/feature.xml
@@ -2,21 +2,21 @@
 <feature
       id="org.eclipse.xsd.mapping.editor"
       label="%featureName"
-      version="2.10.0.qualifier"
+      version="2.11.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.xsd.license"
-      license-feature-version="2.9.0.qualifier">
+      license-feature-version="2.10.0">
 
    <description>
       %description
    </description>
 
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+   <copyright url="http://www.eclipse.org/legal/epl-v20.html">
       Copyright (c) 2002-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
+http://www.eclipse.org/legal/epl-v20.html
    </copyright>
 
    <license url="%licenseURL">
diff --git a/features/org.eclipse.xsd.mapping.editor-feature/pom.xml b/features/org.eclipse.xsd.mapping.editor-feature/pom.xml
index 9ddd64c..2a586c1 100644
--- a/features/org.eclipse.xsd.mapping.editor-feature/pom.xml
+++ b/features/org.eclipse.xsd.mapping.editor-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.xsd.mapping.editor</artifactId>
-  <version>2.10.0-SNAPSHOT</version>
+  <version>2.11.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.xsd.sdk-feature/build.properties b/features/org.eclipse.xsd.sdk-feature/build.properties
index e236b6c..8e24fa2 100644
--- a/features/org.eclipse.xsd.sdk-feature/build.properties
+++ b/features/org.eclipse.xsd.sdk-feature/build.properties
@@ -1,4 +1,3 @@
 bin.includes = feature.xml,\
                feature.properties,\
                p2.inf
-generate.feature@org.eclipse.xsd.source=org.eclipse.xsd.sdk, exclude@org.eclipse.xsd.cheatsheets, exclude@org.eclipse.xsd.doc, exclude@org.eclipse.xsd.ecore.converter, exclude@org.eclipse.xsd.example.installer, exclude@org.eclipse.xsd.mapping, exclude@org.eclipse.xsd.mapping.editor
diff --git a/features/org.eclipse.xsd.sdk-feature/feature.properties b/features/org.eclipse.xsd.sdk-feature/feature.properties
index bbfec6a..4102a18 100644
--- a/features/org.eclipse.xsd.sdk-feature/feature.properties
+++ b/features/org.eclipse.xsd.sdk-feature/feature.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2002-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  * 
 #  * Contributors: 
 #  *   IBM - Initial API and implementation
diff --git a/features/org.eclipse.xsd.sdk-feature/feature.xml b/features/org.eclipse.xsd.sdk-feature/feature.xml
index 0ced095..cb919f4 100644
--- a/features/org.eclipse.xsd.sdk-feature/feature.xml
+++ b/features/org.eclipse.xsd.sdk-feature/feature.xml
@@ -2,21 +2,21 @@
 <feature
       id="org.eclipse.xsd.sdk"
       label="%featureName"
-      version="2.14.0.qualifier"
+      version="2.15.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.xsd.license"
-      license-feature-version="2.9.0.qualifier">
+      license-feature-version="2.10.0">
 
    <description>
       %description
    </description>
 
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+   <copyright url="http://www.eclipse.org/legal/epl-v20.html">
       Copyright (c) 2002-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
+http://www.eclipse.org/legal/epl-v20.html
    </copyright>
 
    <license url="%licenseURL">
diff --git a/features/org.eclipse.xsd.sdk-feature/pom.xml b/features/org.eclipse.xsd.sdk-feature/pom.xml
index c5f0d95..8137086 100644
--- a/features/org.eclipse.xsd.sdk-feature/pom.xml
+++ b/features/org.eclipse.xsd.sdk-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.xsd.sdk</artifactId>
-  <version>2.14.0-SNAPSHOT</version>
+  <version>2.15.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.mapping.xsd2ecore.editor/META-INF/MANIFEST.MF
index 5733c3b..ac891c6 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.mapping.xsd2ecore.editor; singleton:=true
-Bundle-Version: 2.7.0.qualifier
+Bundle-Version: 2.8.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.mapping.xsd2ecore.presentation.XSD2EcoreEditorPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -11,8 +11,8 @@
 Export-Package: org.eclipse.emf.mapping.xsd2ecore.presentation
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.emf.mapping.ui;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.mapping.xsd2ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.xsd.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport
+ org.eclipse.emf.mapping.xsd2ecore;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
+ org.eclipse.xsd.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.mapping.xsd2ecore.editor
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore.editor/about.html b/plugins/org.eclipse.emf.mapping.xsd2ecore.editor/about.html
index 1b8f940..5ab4a4c 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore.editor/about.html
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore.editor/about.html
@@ -8,13 +8,13 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 5, 2007</p>	
+<p>November 22, 2017</p>	
 <h3>License</h3>
 
 <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="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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.emf.mapping.xsd2ecore.editor/plugin.properties b/plugins/org.eclipse.emf.mapping.xsd2ecore.editor/plugin.properties
index 9f55e9b..c3bcce0 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore.editor/plugin.properties
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore.editor/plugin.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2002-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  *
 #  * Contributors:
 #  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore.editor/pom.xml b/plugins/org.eclipse.emf.mapping.xsd2ecore.editor/pom.xml
index 0fcfacb..fb2cf63 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore.editor/pom.xml
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore.editor/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.emf.mapping.xsd2ecore.editor</artifactId>
-  <version>2.7.0-SNAPSHOT</version>
+  <version>2.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore.editor/src/org/eclipse/emf/mapping/xsd2ecore/presentation/XSD2EcoreActionBarContributor.java b/plugins/org.eclipse.emf.mapping.xsd2ecore.editor/src/org/eclipse/emf/mapping/xsd2ecore/presentation/XSD2EcoreActionBarContributor.java
index 49b3906..6565ec0 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore.editor/src/org/eclipse/emf/mapping/xsd2ecore/presentation/XSD2EcoreActionBarContributor.java
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore.editor/src/org/eclipse/emf/mapping/xsd2ecore/presentation/XSD2EcoreActionBarContributor.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore.editor/src/org/eclipse/emf/mapping/xsd2ecore/presentation/XSD2EcoreEditor.java b/plugins/org.eclipse.emf.mapping.xsd2ecore.editor/src/org/eclipse/emf/mapping/xsd2ecore/presentation/XSD2EcoreEditor.java
index e8fe702..7935508 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore.editor/src/org/eclipse/emf/mapping/xsd2ecore/presentation/XSD2EcoreEditor.java
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore.editor/src/org/eclipse/emf/mapping/xsd2ecore/presentation/XSD2EcoreEditor.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore.editor/src/org/eclipse/emf/mapping/xsd2ecore/presentation/XSD2EcoreEditorPlugin.java b/plugins/org.eclipse.emf.mapping.xsd2ecore.editor/src/org/eclipse/emf/mapping/xsd2ecore/presentation/XSD2EcoreEditorPlugin.java
index 4fadcba..fbf9bee 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore.editor/src/org/eclipse/emf/mapping/xsd2ecore/presentation/XSD2EcoreEditorPlugin.java
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore.editor/src/org/eclipse/emf/mapping/xsd2ecore/presentation/XSD2EcoreEditorPlugin.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.mapping.xsd2ecore/META-INF/MANIFEST.MF
index 561f4ea..59655f3 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.mapping.xsd2ecore; singleton:=true
-Bundle-Version: 2.7.0.qualifier
+Bundle-Version: 2.8.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.mapping.xsd2ecore.XSD2EcorePlugin$Implementation
 Bundle-Vendor: %providerName
@@ -16,8 +16,8 @@
  org.eclipse.emf.ecore.xmi;bundle-version="[2.14.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.mapping;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.xsd;bundle-version="[2.14.0,3.0.0)";visibility:=reexport,
- org.eclipse.xsd.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport
+ org.eclipse.xsd;bundle-version="[2.15.0,3.0.0)";visibility:=reexport,
+ org.eclipse.xsd.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.mapping.xsd2ecore
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore/about.html b/plugins/org.eclipse.emf.mapping.xsd2ecore/about.html
index 1b8f940..5ab4a4c 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore/about.html
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore/about.html
@@ -8,13 +8,13 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 5, 2007</p>	
+<p>November 22, 2017</p>	
 <h3>License</h3>
 
 <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="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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.emf.mapping.xsd2ecore/plugin.properties b/plugins/org.eclipse.emf.mapping.xsd2ecore/plugin.properties
index 5ac46bb..b1a3c96 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore/plugin.properties
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore/plugin.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2002-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  *
 #  * Contributors:
 #  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore/pom.xml b/plugins/org.eclipse.emf.mapping.xsd2ecore/pom.xml
index ee38aae..f4f2747 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore/pom.xml
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.emf.mapping.xsd2ecore</artifactId>
-  <version>2.7.0-SNAPSHOT</version>
+  <version>2.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/XSD2EcoreFactory.java b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/XSD2EcoreFactory.java
index 56f8230..d9ccc40 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/XSD2EcoreFactory.java
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/XSD2EcoreFactory.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/XSD2EcoreMapper.java b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/XSD2EcoreMapper.java
index c8a1916..571942e 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/XSD2EcoreMapper.java
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/XSD2EcoreMapper.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/XSD2EcoreMappingRoot.java b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/XSD2EcoreMappingRoot.java
index 4b57580..e9763fd 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/XSD2EcoreMappingRoot.java
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/XSD2EcoreMappingRoot.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/XSD2EcorePackage.java b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/XSD2EcorePackage.java
index 967488d..fbe139a 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/XSD2EcorePackage.java
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/XSD2EcorePackage.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/XSD2EcorePlugin.java b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/XSD2EcorePlugin.java
index 81d2393..ca17a76 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/XSD2EcorePlugin.java
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/XSD2EcorePlugin.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/impl/XSD2EcoreFactoryImpl.java b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/impl/XSD2EcoreFactoryImpl.java
index f42a459..94205bf 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/impl/XSD2EcoreFactoryImpl.java
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/impl/XSD2EcoreFactoryImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/impl/XSD2EcoreMappingRootImpl.java b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/impl/XSD2EcoreMappingRootImpl.java
index 1a1a149..222e8fe 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/impl/XSD2EcoreMappingRootImpl.java
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/impl/XSD2EcoreMappingRootImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/impl/XSD2EcorePackageImpl.java b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/impl/XSD2EcorePackageImpl.java
index c2832c1..896b8c0 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/impl/XSD2EcorePackageImpl.java
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/impl/XSD2EcorePackageImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/provider/XSD2EcoreItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/provider/XSD2EcoreItemProviderAdapterFactory.java
index 9f3c2f9..d094805 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/provider/XSD2EcoreItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/provider/XSD2EcoreItemProviderAdapterFactory.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/provider/XSD2EcoreMappingRootItemProvider.java b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/provider/XSD2EcoreMappingRootItemProvider.java
index 9c1629c..56885ca 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/provider/XSD2EcoreMappingRootItemProvider.java
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/provider/XSD2EcoreMappingRootItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/util/XSD2EcoreAdapterFactory.java b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/util/XSD2EcoreAdapterFactory.java
index e676f25..f836a1b 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/util/XSD2EcoreAdapterFactory.java
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/util/XSD2EcoreAdapterFactory.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/util/XSD2EcoreResourceFactoryImpl.java b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/util/XSD2EcoreResourceFactoryImpl.java
index d3a977b..bb6899e 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/util/XSD2EcoreResourceFactoryImpl.java
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/util/XSD2EcoreResourceFactoryImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/util/XSD2EcoreResourceImpl.java b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/util/XSD2EcoreResourceImpl.java
index 2b26473..8f274b6 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/util/XSD2EcoreResourceImpl.java
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/util/XSD2EcoreResourceImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/util/XSD2EcoreSwitch.java b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/util/XSD2EcoreSwitch.java
index c61cc63..51463e9 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/util/XSD2EcoreSwitch.java
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/util/XSD2EcoreSwitch.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.ecore.converter/META-INF/MANIFEST.MF b/plugins/org.eclipse.xsd.ecore.converter/META-INF/MANIFEST.MF
index d138b41..649df37 100644
--- a/plugins/org.eclipse.xsd.ecore.converter/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xsd.ecore.converter/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.xsd.ecore.converter;singleton:=true
-Bundle-Version: 2.7.0.qualifier
+Bundle-Version: 2.8.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.xsd.ecore.converter/about.html b/plugins/org.eclipse.xsd.ecore.converter/about.html
index 1b8f940..5ab4a4c 100644
--- a/plugins/org.eclipse.xsd.ecore.converter/about.html
+++ b/plugins/org.eclipse.xsd.ecore.converter/about.html
@@ -8,13 +8,13 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 5, 2007</p>	
+<p>November 22, 2017</p>	
 <h3>License</h3>
 
 <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="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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.xsd.ecore.converter/about.properties b/plugins/org.eclipse.xsd.ecore.converter/about.properties
index d7cb037..bce315c 100644
--- a/plugins/org.eclipse.xsd.ecore.converter/about.properties
+++ b/plugins/org.eclipse.xsd.ecore.converter/about.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2002-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  *
 #  * Contributors:
 #  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.ecore.converter/plugin.properties b/plugins/org.eclipse.xsd.ecore.converter/plugin.properties
index 322d6d9..0d17458 100644
--- a/plugins/org.eclipse.xsd.ecore.converter/plugin.properties
+++ b/plugins/org.eclipse.xsd.ecore.converter/plugin.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2002-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  *
 #  * Contributors:
 #  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.ecore.converter/pom.xml b/plugins/org.eclipse.xsd.ecore.converter/pom.xml
index c29bf3a..a2a13a8 100644
--- a/plugins/org.eclipse.xsd.ecore.converter/pom.xml
+++ b/plugins/org.eclipse.xsd.ecore.converter/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.xsd.ecore.converter</artifactId>
-  <version>2.7.0-SNAPSHOT</version>
+  <version>2.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.xsd.ecore.exporter/META-INF/MANIFEST.MF b/plugins/org.eclipse.xsd.ecore.exporter/META-INF/MANIFEST.MF
index e1fc1ff..9bf4b16 100644
--- a/plugins/org.eclipse.xsd.ecore.exporter/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xsd.ecore.exporter/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.xsd.ecore.exporter; singleton:=true
-Bundle-Version: 2.6.0.qualifier
+Bundle-Version: 2.7.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.xsd.ecore.exporter.XSDExporterPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -11,7 +11,7 @@
 Export-Package: org.eclipse.xsd.ecore.exporter,
  org.eclipse.xsd.ecore.exporter.ui
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.xsd;bundle-version="[2.14.0,3.0.0)",
+ org.eclipse.xsd;bundle-version="[2.15.0,3.0.0)",
  org.eclipse.emf.exporter;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.14.0,3.0.0)";resolution:=optional,
  org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)";resolution:=optional
diff --git a/plugins/org.eclipse.xsd.ecore.exporter/about.html b/plugins/org.eclipse.xsd.ecore.exporter/about.html
index 1b8f940..5ab4a4c 100644
--- a/plugins/org.eclipse.xsd.ecore.exporter/about.html
+++ b/plugins/org.eclipse.xsd.ecore.exporter/about.html
@@ -8,13 +8,13 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 5, 2007</p>	
+<p>November 22, 2017</p>	
 <h3>License</h3>
 
 <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="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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.xsd.ecore.exporter/plugin.properties b/plugins/org.eclipse.xsd.ecore.exporter/plugin.properties
index fa8a376..8e71d3e 100644
--- a/plugins/org.eclipse.xsd.ecore.exporter/plugin.properties
+++ b/plugins/org.eclipse.xsd.ecore.exporter/plugin.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2002-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  * 
 #  * Contributors: 
 #  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.ecore.exporter/pom.xml b/plugins/org.eclipse.xsd.ecore.exporter/pom.xml
index 56ff88b..7891c7e 100644
--- a/plugins/org.eclipse.xsd.ecore.exporter/pom.xml
+++ b/plugins/org.eclipse.xsd.ecore.exporter/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.xsd.ecore.exporter</artifactId>
-  <version>2.6.0-SNAPSHOT</version>
+  <version>2.7.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.xsd.ecore.exporter/src/org/eclipse/xsd/ecore/exporter/XMIExporter.java b/plugins/org.eclipse.xsd.ecore.exporter/src/org/eclipse/xsd/ecore/exporter/XMIExporter.java
index 4ff777d..618d544 100644
--- a/plugins/org.eclipse.xsd.ecore.exporter/src/org/eclipse/xsd/ecore/exporter/XMIExporter.java
+++ b/plugins/org.eclipse.xsd.ecore.exporter/src/org/eclipse/xsd/ecore/exporter/XMIExporter.java
@@ -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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.ecore.exporter/src/org/eclipse/xsd/ecore/exporter/XSDExporter.java b/plugins/org.eclipse.xsd.ecore.exporter/src/org/eclipse/xsd/ecore/exporter/XSDExporter.java
index bf85973..432c0bf 100644
--- a/plugins/org.eclipse.xsd.ecore.exporter/src/org/eclipse/xsd/ecore/exporter/XSDExporter.java
+++ b/plugins/org.eclipse.xsd.ecore.exporter/src/org/eclipse/xsd/ecore/exporter/XSDExporter.java
@@ -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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.ecore.exporter/src/org/eclipse/xsd/ecore/exporter/XSDExporterPlugin.java b/plugins/org.eclipse.xsd.ecore.exporter/src/org/eclipse/xsd/ecore/exporter/XSDExporterPlugin.java
index 42e2701..894849d 100644
--- a/plugins/org.eclipse.xsd.ecore.exporter/src/org/eclipse/xsd/ecore/exporter/XSDExporterPlugin.java
+++ b/plugins/org.eclipse.xsd.ecore.exporter/src/org/eclipse/xsd/ecore/exporter/XSDExporterPlugin.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.ecore.exporter/src/org/eclipse/xsd/ecore/exporter/ui/XMIExporterWizard.java b/plugins/org.eclipse.xsd.ecore.exporter/src/org/eclipse/xsd/ecore/exporter/ui/XMIExporterWizard.java
index a42687e..d4830a5 100644
--- a/plugins/org.eclipse.xsd.ecore.exporter/src/org/eclipse/xsd/ecore/exporter/ui/XMIExporterWizard.java
+++ b/plugins/org.eclipse.xsd.ecore.exporter/src/org/eclipse/xsd/ecore/exporter/ui/XMIExporterWizard.java
@@ -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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.ecore.exporter/src/org/eclipse/xsd/ecore/exporter/ui/XSDExporterWizard.java b/plugins/org.eclipse.xsd.ecore.exporter/src/org/eclipse/xsd/ecore/exporter/ui/XSDExporterWizard.java
index 6a47bd2..550e4e0 100644
--- a/plugins/org.eclipse.xsd.ecore.exporter/src/org/eclipse/xsd/ecore/exporter/ui/XSDExporterWizard.java
+++ b/plugins/org.eclipse.xsd.ecore.exporter/src/org/eclipse/xsd/ecore/exporter/ui/XSDExporterWizard.java
@@ -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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.ecore.importer/META-INF/MANIFEST.MF b/plugins/org.eclipse.xsd.ecore.importer/META-INF/MANIFEST.MF
index f2d4352..3d222c8 100644
--- a/plugins/org.eclipse.xsd.ecore.importer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xsd.ecore.importer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.xsd.ecore.importer; singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.xsd.ecore.importer.XSDImporterPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -13,9 +13,9 @@
  org.eclipse.xsd.ecore.importer.ui
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.xsd;bundle-version="[2.14.0,3.0.0)",
+ org.eclipse.xsd;bundle-version="[2.15.0,3.0.0)",
  org.eclipse.emf.importer;bundle-version="[2.10.0,3.0.0)",
- org.eclipse.emf.mapping.xsd2ecore;bundle-version="[2.7.0,3.0.0)";resolution:=optional,
+ org.eclipse.emf.mapping.xsd2ecore;bundle-version="[2.8.0,3.0.0)";resolution:=optional,
  org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.14.0,3.0.0)";resolution:=optional,
  org.apache.ant;bundle-version="[1.7.0,2.0.0)";resolution:=optional,
  org.eclipse.emf.ant;bundle-version="[2.9.0,3.0.0)";resolution:=optional
diff --git a/plugins/org.eclipse.xsd.ecore.importer/about.html b/plugins/org.eclipse.xsd.ecore.importer/about.html
index 1b8f940..5ab4a4c 100644
--- a/plugins/org.eclipse.xsd.ecore.importer/about.html
+++ b/plugins/org.eclipse.xsd.ecore.importer/about.html
@@ -8,13 +8,13 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 5, 2007</p>	
+<p>November 22, 2017</p>	
 <h3>License</h3>
 
 <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="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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.xsd.ecore.importer/plugin.properties b/plugins/org.eclipse.xsd.ecore.importer/plugin.properties
index de4960d..831fc0b 100644
--- a/plugins/org.eclipse.xsd.ecore.importer/plugin.properties
+++ b/plugins/org.eclipse.xsd.ecore.importer/plugin.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2002-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  * 
 #  * Contributors: 
 #  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.ecore.importer/pom.xml b/plugins/org.eclipse.xsd.ecore.importer/pom.xml
index deb8bbf..cc1c90c 100644
--- a/plugins/org.eclipse.xsd.ecore.importer/pom.xml
+++ b/plugins/org.eclipse.xsd.ecore.importer/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.xsd.ecore.importer</artifactId>
-  <version>2.8.0-SNAPSHOT</version>
+  <version>2.9.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/XSDImporter.java b/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/XSDImporter.java
index 2edfdc8..8362331 100644
--- a/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/XSDImporter.java
+++ b/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/XSDImporter.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2005-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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/XSDImporterApplication.java b/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/XSDImporterApplication.java
index 2736641..754e0cc 100644
--- a/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/XSDImporterApplication.java
+++ b/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/XSDImporterApplication.java
@@ -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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/XSDImporterPlugin.java b/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/XSDImporterPlugin.java
index 7d183a2..198aad0 100644
--- a/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/XSDImporterPlugin.java
+++ b/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/XSDImporterPlugin.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/ui/XSDDetailPage.java b/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/ui/XSDDetailPage.java
index 8e7e1ba..e411b6c 100644
--- a/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/ui/XSDDetailPage.java
+++ b/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/ui/XSDDetailPage.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2005-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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/ui/XSDImporterWizard.java b/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/ui/XSDImporterWizard.java
index e990ca7..2c8972e 100644
--- a/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/ui/XSDImporterWizard.java
+++ b/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/ui/XSDImporterWizard.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2005-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/ui/XSDPackagePage.java b/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/ui/XSDPackagePage.java
index a456d10..96e62ae 100644
--- a/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/ui/XSDPackagePage.java
+++ b/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/ui/XSDPackagePage.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2007 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.ecore.importer/tasks/org/eclipse/xsd/ecore/importer/taskdefs/XSDGeneratorTask.java b/plugins/org.eclipse.xsd.ecore.importer/tasks/org/eclipse/xsd/ecore/importer/taskdefs/XSDGeneratorTask.java
index b1fb219..e90c005 100644
--- a/plugins/org.eclipse.xsd.ecore.importer/tasks/org/eclipse/xsd/ecore/importer/taskdefs/XSDGeneratorTask.java
+++ b/plugins/org.eclipse.xsd.ecore.importer/tasks/org/eclipse/xsd/ecore/importer/taskdefs/XSDGeneratorTask.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2004-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.xsd.edit/META-INF/MANIFEST.MF
index 9ec716e..f6c44ec 100644
--- a/plugins/org.eclipse.xsd.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xsd.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.xsd.edit; singleton:=true
-Bundle-Version: 2.9.0.qualifier
+Bundle-Version: 2.10.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.xsd.provider.XSDEditPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -11,7 +11,7 @@
 Export-Package: org.eclipse.xsd.provider
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.13.0,3.0.0)";visibility:=reexport,
- org.eclipse.xsd;bundle-version="[2.14.0,3.0.0)";visibility:=reexport
+ org.eclipse.xsd;bundle-version="[2.15.0,3.0.0)";visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.xsd.edit
diff --git a/plugins/org.eclipse.xsd.edit/about.html b/plugins/org.eclipse.xsd.edit/about.html
index 1b8f940..5ab4a4c 100644
--- a/plugins/org.eclipse.xsd.edit/about.html
+++ b/plugins/org.eclipse.xsd.edit/about.html
@@ -8,13 +8,13 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 5, 2007</p>	
+<p>November 22, 2017</p>	
 <h3>License</h3>
 
 <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="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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.xsd.edit/about.properties b/plugins/org.eclipse.xsd.edit/about.properties
index 1912e0f..ca9fd14 100644
--- a/plugins/org.eclipse.xsd.edit/about.properties
+++ b/plugins/org.eclipse.xsd.edit/about.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2002-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  *
 #  * Contributors:
 #  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/plugin.properties b/plugins/org.eclipse.xsd.edit/plugin.properties
index 0e36465..c724d59 100644
--- a/plugins/org.eclipse.xsd.edit/plugin.properties
+++ b/plugins/org.eclipse.xsd.edit/plugin.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2002-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  * 
 #  * Contributors: 
 #  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/pom.xml b/plugins/org.eclipse.xsd.edit/pom.xml
index 1cafaab..1fa087b 100644
--- a/plugins/org.eclipse.xsd.edit/pom.xml
+++ b/plugins/org.eclipse.xsd.edit/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.xsd.edit</artifactId>
-  <version>2.9.0-SNAPSHOT</version>
+  <version>2.10.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDAnnotationItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDAnnotationItemProvider.java
index eee0331..0b1f3e0 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDAnnotationItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDAnnotationItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDAttributeDeclarationItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDAttributeDeclarationItemProvider.java
index 17bf4c0..24ebf66 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDAttributeDeclarationItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDAttributeDeclarationItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDAttributeGroupContentItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDAttributeGroupContentItemProvider.java
index 8a520b4..9e0d95b 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDAttributeGroupContentItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDAttributeGroupContentItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDAttributeGroupDefinitionItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDAttributeGroupDefinitionItemProvider.java
index daff6ec..3a63d58 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDAttributeGroupDefinitionItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDAttributeGroupDefinitionItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDAttributeUseItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDAttributeUseItemProvider.java
index 603377f..c140c8c 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDAttributeUseItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDAttributeUseItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDBoundedFacetItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDBoundedFacetItemProvider.java
index b3b032e..d787f59 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDBoundedFacetItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDBoundedFacetItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDCardinalityFacetItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDCardinalityFacetItemProvider.java
index 435d4d2..3e5289b 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDCardinalityFacetItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDCardinalityFacetItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDComplexTypeContentItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDComplexTypeContentItemProvider.java
index 2345aa6..08a31a1 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDComplexTypeContentItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDComplexTypeContentItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDComplexTypeDefinitionItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDComplexTypeDefinitionItemProvider.java
index a12d78f..a0bf2e3 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDComplexTypeDefinitionItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDComplexTypeDefinitionItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDComponentItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDComponentItemProvider.java
index 7bbcfe5..3a47f23 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDComponentItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDComponentItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDConcreteComponentItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDConcreteComponentItemProvider.java
index 1b9aed3..759625f 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDConcreteComponentItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDConcreteComponentItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDConstrainingFacetItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDConstrainingFacetItemProvider.java
index 64e47db..4648f05 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDConstrainingFacetItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDConstrainingFacetItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDDiagnosticItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDDiagnosticItemProvider.java
index 6199823..c0b0691 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDDiagnosticItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDDiagnosticItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDEditPlugin.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDEditPlugin.java
index 1f21dc6..4603ef0 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDEditPlugin.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDEditPlugin.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDElementDeclarationItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDElementDeclarationItemProvider.java
index 1a6dded..574518f 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDElementDeclarationItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDElementDeclarationItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDEnumerationFacetItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDEnumerationFacetItemProvider.java
index 8864734..adef986 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDEnumerationFacetItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDEnumerationFacetItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDFacetItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDFacetItemProvider.java
index 9754a20..e04acb3 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDFacetItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDFacetItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDFeatureItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDFeatureItemProvider.java
index 0be2efd..43def5c 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDFeatureItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDFeatureItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDFixedFacetItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDFixedFacetItemProvider.java
index af9c4b2..d80d4fb 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDFixedFacetItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDFixedFacetItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDFractionDigitsFacetItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDFractionDigitsFacetItemProvider.java
index 701125b..57a7caf 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDFractionDigitsFacetItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDFractionDigitsFacetItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDFundamentalFacetItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDFundamentalFacetItemProvider.java
index 01c0fe4..3e743b8 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDFundamentalFacetItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDFundamentalFacetItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDIdentityConstraintDefinitionItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDIdentityConstraintDefinitionItemProvider.java
index ffa257f..077c7e7 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDIdentityConstraintDefinitionItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDIdentityConstraintDefinitionItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDImportItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDImportItemProvider.java
index 2a24856..1cb3bc7 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDImportItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDImportItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDIncludeItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDIncludeItemProvider.java
index f3195b7..9afcaad 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDIncludeItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDIncludeItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDItemProviderAdapter.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDItemProviderAdapter.java
index 86746e3..f6d72da 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDItemProviderAdapter.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDItemProviderAdapter.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDItemProviderAdapterFactory.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDItemProviderAdapterFactory.java
index cbfd7ba..96f6c50 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDItemProviderAdapterFactory.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDLengthFacetItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDLengthFacetItemProvider.java
index 7a1e538..dc25087 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDLengthFacetItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDLengthFacetItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMaxExclusiveFacetItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMaxExclusiveFacetItemProvider.java
index 2ff89fe..435303c 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMaxExclusiveFacetItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMaxExclusiveFacetItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMaxFacetItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMaxFacetItemProvider.java
index c9dc79a..1e10f32 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMaxFacetItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMaxFacetItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMaxInclusiveFacetItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMaxInclusiveFacetItemProvider.java
index 4d6f5c2..a0405ac 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMaxInclusiveFacetItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMaxInclusiveFacetItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMaxLengthFacetItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMaxLengthFacetItemProvider.java
index a4763ea..a140b28 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMaxLengthFacetItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMaxLengthFacetItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMinExclusiveFacetItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMinExclusiveFacetItemProvider.java
index 2c06d72..8631fa8 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMinExclusiveFacetItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMinExclusiveFacetItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMinFacetItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMinFacetItemProvider.java
index a6920a4..fc1f80e 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMinFacetItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMinFacetItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMinInclusiveFacetItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMinInclusiveFacetItemProvider.java
index e5a126a..49fd502 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMinInclusiveFacetItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMinInclusiveFacetItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMinLengthFacetItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMinLengthFacetItemProvider.java
index 9415587..fcb0d07 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMinLengthFacetItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDMinLengthFacetItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDModelGroupDefinitionItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDModelGroupDefinitionItemProvider.java
index 7d27d2e..fdffd9b 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDModelGroupDefinitionItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDModelGroupDefinitionItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDModelGroupItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDModelGroupItemProvider.java
index 7ca576e..1d15007 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDModelGroupItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDModelGroupItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDNamedComponentItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDNamedComponentItemProvider.java
index b6297cc..5ad361d 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDNamedComponentItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDNamedComponentItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDNotationDeclarationItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDNotationDeclarationItemProvider.java
index bb08212..5300041 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDNotationDeclarationItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDNotationDeclarationItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDNumericFacetItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDNumericFacetItemProvider.java
index 9e1002d..4e86bcf 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDNumericFacetItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDNumericFacetItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDOrderedFacetItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDOrderedFacetItemProvider.java
index afc16bb..caaa2f6 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDOrderedFacetItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDOrderedFacetItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDParticleContentItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDParticleContentItemProvider.java
index fdc7002..e07a0b7 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDParticleContentItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDParticleContentItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDParticleItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDParticleItemProvider.java
index 82a875e..cd0cc8c 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDParticleItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDParticleItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDPatternFacetItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDPatternFacetItemProvider.java
index bff3e56..3424fa9 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDPatternFacetItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDPatternFacetItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDRedefinableComponentItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDRedefinableComponentItemProvider.java
index 2ba785f..87b0d6a 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDRedefinableComponentItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDRedefinableComponentItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDRedefineContentItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDRedefineContentItemProvider.java
index bf562d2..4f04854 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDRedefineContentItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDRedefineContentItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDRedefineItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDRedefineItemProvider.java
index c7a8dda..455f2b6 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDRedefineItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDRedefineItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDRepeatableFacetItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDRepeatableFacetItemProvider.java
index a9ee4b8..3a775e9 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDRepeatableFacetItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDRepeatableFacetItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDSchemaCompositorItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDSchemaCompositorItemProvider.java
index 9c37fa8..7c7e137 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDSchemaCompositorItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDSchemaCompositorItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDSchemaContentItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDSchemaContentItemProvider.java
index 4709245..bb0dcfe 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDSchemaContentItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDSchemaContentItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDSchemaDirectiveItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDSchemaDirectiveItemProvider.java
index 154b1a4..0bd9024 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDSchemaDirectiveItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDSchemaDirectiveItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDSchemaItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDSchemaItemProvider.java
index 193c06b..4d99118 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDSchemaItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDSchemaItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDScopeItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDScopeItemProvider.java
index 5d33c7b..48dd730 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDScopeItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDScopeItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDSemanticItemProviderAdapterFactory.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDSemanticItemProviderAdapterFactory.java
index 441e339..03851b9 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDSemanticItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDSemanticItemProviderAdapterFactory.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDSimpleTypeDefinitionItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDSimpleTypeDefinitionItemProvider.java
index 1d2754d..802a0f2 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDSimpleTypeDefinitionItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDSimpleTypeDefinitionItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDTermItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDTermItemProvider.java
index 125b742..22bd6ed 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDTermItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDTermItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDTotalDigitsFacetItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDTotalDigitsFacetItemProvider.java
index bdd035c..3177f39 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDTotalDigitsFacetItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDTotalDigitsFacetItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDTypeDefinitionItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDTypeDefinitionItemProvider.java
index 6e9f7af..1eb2979 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDTypeDefinitionItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDTypeDefinitionItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDWhiteSpaceFacetItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDWhiteSpaceFacetItemProvider.java
index a5234d4..3666554 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDWhiteSpaceFacetItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDWhiteSpaceFacetItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDWildcardItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDWildcardItemProvider.java
index bdd6698..e59189e 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDWildcardItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDWildcardItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDXPathDefinitionItemProvider.java b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDXPathDefinitionItemProvider.java
index 9811c24..71a0466 100644
--- a/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDXPathDefinitionItemProvider.java
+++ b/plugins/org.eclipse.xsd.edit/src/org/eclipse/xsd/provider/XSDXPathDefinitionItemProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.xsd.editor/META-INF/MANIFEST.MF
index 969c585..3ab1451 100644
--- a/plugins/org.eclipse.xsd.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xsd.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.xsd.editor; singleton:=true
-Bundle-Version: 2.10.0.qualifier
+Bundle-Version: 2.11.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.xsd.presentation.XSDEditorPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -17,7 +17,7 @@
  org.eclipse.ui.editors;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
  org.eclipse.emf.edit.ui;bundle-version="[2.14.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="[2.14.0,3.0.0)",
- org.eclipse.xsd.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport
+ org.eclipse.xsd.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.xsd.editor
diff --git a/plugins/org.eclipse.xsd.editor/about.html b/plugins/org.eclipse.xsd.editor/about.html
index 1b8f940..5ab4a4c 100644
--- a/plugins/org.eclipse.xsd.editor/about.html
+++ b/plugins/org.eclipse.xsd.editor/about.html
@@ -8,13 +8,13 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 5, 2007</p>	
+<p>November 22, 2017</p>	
 <h3>License</h3>
 
 <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="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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.xsd.editor/about.properties b/plugins/org.eclipse.xsd.editor/about.properties
index 548d530..87e5a90 100644
--- a/plugins/org.eclipse.xsd.editor/about.properties
+++ b/plugins/org.eclipse.xsd.editor/about.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2002-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  *
 #  * Contributors:
 #  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.editor/plugin.properties b/plugins/org.eclipse.xsd.editor/plugin.properties
index f127fb1..949b9c3 100644
--- a/plugins/org.eclipse.xsd.editor/plugin.properties
+++ b/plugins/org.eclipse.xsd.editor/plugin.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2002-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  * 
 #  * Contributors: 
 #  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.editor/pom.xml b/plugins/org.eclipse.xsd.editor/pom.xml
index 3b09d2e..d43e67e 100644
--- a/plugins/org.eclipse.xsd.editor/pom.xml
+++ b/plugins/org.eclipse.xsd.editor/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.xsd.editor</artifactId>
-  <version>2.10.0-SNAPSHOT</version>
+  <version>2.11.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.xsd.editor/src/org/eclipse/xsd/presentation/XSDEditor.java b/plugins/org.eclipse.xsd.editor/src/org/eclipse/xsd/presentation/XSDEditor.java
index 0ac1eb0..a154166 100644
--- a/plugins/org.eclipse.xsd.editor/src/org/eclipse/xsd/presentation/XSDEditor.java
+++ b/plugins/org.eclipse.xsd.editor/src/org/eclipse/xsd/presentation/XSDEditor.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.editor/src/org/eclipse/xsd/presentation/XSDEditorPlugin.java b/plugins/org.eclipse.xsd.editor/src/org/eclipse/xsd/presentation/XSDEditorPlugin.java
index c1c849e..0ef697c 100644
--- a/plugins/org.eclipse.xsd.editor/src/org/eclipse/xsd/presentation/XSDEditorPlugin.java
+++ b/plugins/org.eclipse.xsd.editor/src/org/eclipse/xsd/presentation/XSDEditorPlugin.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.editor/src/org/eclipse/xsd/presentation/XSDModelWizard.java b/plugins/org.eclipse.xsd.editor/src/org/eclipse/xsd/presentation/XSDModelWizard.java
index 9a3aee5..0793e67 100644
--- a/plugins/org.eclipse.xsd.editor/src/org/eclipse/xsd/presentation/XSDModelWizard.java
+++ b/plugins/org.eclipse.xsd.editor/src/org/eclipse/xsd/presentation/XSDModelWizard.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.example.installer/META-INF/MANIFEST.MF b/plugins/org.eclipse.xsd.example.installer/META-INF/MANIFEST.MF
index 16885fa..cb0ece1 100644
--- a/plugins/org.eclipse.xsd.example.installer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xsd.example.installer/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.xsd.example.installer;singleton:=true
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.4.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.emf.common.ui;bundle-version="[2.13.0,3.0.0)",
- org.eclipse.xsd;bundle-version="[2.14.0,3.0.0)"
+ org.eclipse.xsd;bundle-version="[2.15.0,3.0.0)"
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.xsd.example.installer/about.html b/plugins/org.eclipse.xsd.example.installer/about.html
index aa5ef64..adf286c 100644
--- a/plugins/org.eclipse.xsd.example.installer/about.html
+++ b/plugins/org.eclipse.xsd.example.installer/about.html
@@ -14,7 +14,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 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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.xsd.example.installer/copyExampleLib.ant b/plugins/org.eclipse.xsd.example.installer/copyExampleLib.ant
index 0d3fe40..33ca7d2 100644
--- a/plugins/org.eclipse.xsd.example.installer/copyExampleLib.ant
+++ b/plugins/org.eclipse.xsd.example.installer/copyExampleLib.ant
@@ -2,9 +2,9 @@
 <!--
 	Copyright (c) 2012 Eclispe contributors 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
+	http://www.eclipse.org/legal/epl-v20.html
 -->
 <project name="copyExampleLib" basedir="..">
 
diff --git a/plugins/org.eclipse.xsd.example.installer/plugin.properties b/plugins/org.eclipse.xsd.example.installer/plugin.properties
index 9baa09a..4a41841 100644
--- a/plugins/org.eclipse.xsd.example.installer/plugin.properties
+++ b/plugins/org.eclipse.xsd.example.installer/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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  *
 #  * Contributors:
 #  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.example.installer/pom.xml b/plugins/org.eclipse.xsd.example.installer/pom.xml
index ee33b41..938c647 100644
--- a/plugins/org.eclipse.xsd.example.installer/pom.xml
+++ b/plugins/org.eclipse.xsd.example.installer/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.xsd.example.installer</artifactId>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.xsd.mapping.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.xsd.mapping.editor/META-INF/MANIFEST.MF
index 65e6c6e..75a2ca4 100644
--- a/plugins/org.eclipse.xsd.mapping.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xsd.mapping.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.xsd.mapping.editor;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.xsd.mapping.editor/about.html b/plugins/org.eclipse.xsd.mapping.editor/about.html
index 1b8f940..5ab4a4c 100644
--- a/plugins/org.eclipse.xsd.mapping.editor/about.html
+++ b/plugins/org.eclipse.xsd.mapping.editor/about.html
@@ -8,13 +8,13 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 5, 2007</p>	
+<p>November 22, 2017</p>	
 <h3>License</h3>
 
 <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="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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.xsd.mapping.editor/about.properties b/plugins/org.eclipse.xsd.mapping.editor/about.properties
index 6cd79f2..823430a 100644
--- a/plugins/org.eclipse.xsd.mapping.editor/about.properties
+++ b/plugins/org.eclipse.xsd.mapping.editor/about.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2002-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  *
 #  * Contributors:
 #  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.mapping.editor/plugin.properties b/plugins/org.eclipse.xsd.mapping.editor/plugin.properties
index 2fc08c9..ca92779 100644
--- a/plugins/org.eclipse.xsd.mapping.editor/plugin.properties
+++ b/plugins/org.eclipse.xsd.mapping.editor/plugin.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2002-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  *
 #  * Contributors:
 #  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.mapping.editor/pom.xml b/plugins/org.eclipse.xsd.mapping.editor/pom.xml
index d83a643..5652334 100644
--- a/plugins/org.eclipse.xsd.mapping.editor/pom.xml
+++ b/plugins/org.eclipse.xsd.mapping.editor/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.xsd.mapping.editor</artifactId>
-  <version>2.8.0-SNAPSHOT</version>
+  <version>2.9.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.xsd.mapping/META-INF/MANIFEST.MF b/plugins/org.eclipse.xsd.mapping/META-INF/MANIFEST.MF
index 122c3d4..1bb3a49 100644
--- a/plugins/org.eclipse.xsd.mapping/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xsd.mapping/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.xsd.mapping;singleton:=true
-Bundle-Version: 2.7.0.qualifier
+Bundle-Version: 2.8.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.xsd.mapping/about.html b/plugins/org.eclipse.xsd.mapping/about.html
index 1b8f940..5ab4a4c 100644
--- a/plugins/org.eclipse.xsd.mapping/about.html
+++ b/plugins/org.eclipse.xsd.mapping/about.html
@@ -8,13 +8,13 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 5, 2007</p>	
+<p>November 22, 2017</p>	
 <h3>License</h3>
 
 <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="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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.xsd.mapping/about.properties b/plugins/org.eclipse.xsd.mapping/about.properties
index 9f3a0f6..4883e61 100644
--- a/plugins/org.eclipse.xsd.mapping/about.properties
+++ b/plugins/org.eclipse.xsd.mapping/about.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2002-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  *
 #  * Contributors:
 #  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.mapping/plugin.properties b/plugins/org.eclipse.xsd.mapping/plugin.properties
index 11e97b2..d5b8913 100644
--- a/plugins/org.eclipse.xsd.mapping/plugin.properties
+++ b/plugins/org.eclipse.xsd.mapping/plugin.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2002-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  *
 #  * Contributors:
 #  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd.mapping/pom.xml b/plugins/org.eclipse.xsd.mapping/pom.xml
index a8a105d..a99a03d 100644
--- a/plugins/org.eclipse.xsd.mapping/pom.xml
+++ b/plugins/org.eclipse.xsd.mapping/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.xsd.mapping</artifactId>
-  <version>2.7.0-SNAPSHOT</version>
+  <version>2.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.xsd/META-INF/MANIFEST.MF b/plugins/org.eclipse.xsd/META-INF/MANIFEST.MF
index b153b58..9fac74c 100644
--- a/plugins/org.eclipse.xsd/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xsd/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.xsd; singleton:=true
-Bundle-Version: 2.14.0.qualifier
+Bundle-Version: 2.15.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.xsd.XSDPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.xsd/about.html b/plugins/org.eclipse.xsd/about.html
index 1b8f940..5ab4a4c 100644
--- a/plugins/org.eclipse.xsd/about.html
+++ b/plugins/org.eclipse.xsd/about.html
@@ -8,13 +8,13 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 5, 2007</p>	
+<p>November 22, 2017</p>	
 <h3>License</h3>
 
 <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="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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.xsd/about.properties b/plugins/org.eclipse.xsd/about.properties
index 6ece652..b9447cb 100644
--- a/plugins/org.eclipse.xsd/about.properties
+++ b/plugins/org.eclipse.xsd/about.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2002-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  *
 #  * Contributors:
 #  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/plugin.properties b/plugins/org.eclipse.xsd/plugin.properties
index 79db293..8e5beee 100644
--- a/plugins/org.eclipse.xsd/plugin.properties
+++ b/plugins/org.eclipse.xsd/plugin.properties
@@ -1,9 +1,9 @@
 # /**
 #  * Copyright (c) 2002-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
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  * 
 #  * Contributors: 
 #  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/pom.xml b/plugins/org.eclipse.xsd/pom.xml
index f05f62d..174a681 100644
--- a/plugins/org.eclipse.xsd/pom.xml
+++ b/plugins/org.eclipse.xsd/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.xsd</artifactId>
-  <version>2.14.0-SNAPSHOT</version>
+  <version>2.15.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAnnotation.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAnnotation.java
index 610a745..2ad02d4 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAnnotation.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAnnotation.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeDeclaration.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeDeclaration.java
index 340388f..0791c04 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeDeclaration.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeDeclaration.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeGroupContent.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeGroupContent.java
index 75bc490..6a2c38f 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeGroupContent.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeGroupContent.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeGroupDefinition.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeGroupDefinition.java
index fa53b95..6702f5d 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeGroupDefinition.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeGroupDefinition.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeUse.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeUse.java
index 8b96c18..067dbcb 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeUse.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeUse.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeUseCategory.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeUseCategory.java
index e631b7a..9059a7d 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeUseCategory.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeUseCategory.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDBoundedFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDBoundedFacet.java
index 2f0031d..bb76a4a 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDBoundedFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDBoundedFacet.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDCardinality.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDCardinality.java
index 6848287..3f3c0de 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDCardinality.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDCardinality.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDCardinalityFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDCardinalityFacet.java
index 35f3f64..3921f73 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDCardinalityFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDCardinalityFacet.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDComplexFinal.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDComplexFinal.java
index 5880b66..d13f043 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDComplexFinal.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDComplexFinal.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDComplexTypeContent.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDComplexTypeContent.java
index 5cb5cb9..0958065 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDComplexTypeContent.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDComplexTypeContent.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDComplexTypeDefinition.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDComplexTypeDefinition.java
index 90543ac..ba4303f 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDComplexTypeDefinition.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDComplexTypeDefinition.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDComponent.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDComponent.java
index 4858be9..0cf9109 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDComponent.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDComponent.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDCompositor.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDCompositor.java
index 9981851..4fa0117 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDCompositor.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDCompositor.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDConcreteComponent.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDConcreteComponent.java
index e9a2921..81c8152 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDConcreteComponent.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDConcreteComponent.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDConstrainingFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDConstrainingFacet.java
index d2e2671..8679499 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDConstrainingFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDConstrainingFacet.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDConstraint.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDConstraint.java
index d7d9f69..a507aa9 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDConstraint.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDConstraint.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDContentTypeCategory.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDContentTypeCategory.java
index d2e3432..6d4ffbf 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDContentTypeCategory.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDContentTypeCategory.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDerivationMethod.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDerivationMethod.java
index bd9449f..3f56687 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDerivationMethod.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDerivationMethod.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDiagnostic.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDiagnostic.java
index 56293e2..152c0b7 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDiagnostic.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDiagnostic.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDiagnosticSeverity.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDiagnosticSeverity.java
index 7308baf..4a4135b 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDiagnosticSeverity.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDiagnosticSeverity.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDisallowedSubstitutions.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDisallowedSubstitutions.java
index 1063b46..745a472 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDisallowedSubstitutions.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDisallowedSubstitutions.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDElementDeclaration.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDElementDeclaration.java
index b0dc739..0624667 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDElementDeclaration.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDElementDeclaration.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDEnumerationFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDEnumerationFacet.java
index 7a22b0c..eb0b15e 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDEnumerationFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDEnumerationFacet.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFacet.java
index c937093..cbeef83 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFacet.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFactory.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFactory.java
index 5eb4715..1e540ee 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFactory.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFactory.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFeature.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFeature.java
index 8afc81e..708a950 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFeature.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFeature.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFixedFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFixedFacet.java
index c9353a7..061016c 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFixedFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFixedFacet.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDForm.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDForm.java
index 04b321b..94e2339 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDForm.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDForm.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFractionDigitsFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFractionDigitsFacet.java
index 0a05626..58000e7 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFractionDigitsFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFractionDigitsFacet.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFundamentalFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFundamentalFacet.java
index 234e3fd..3719409 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFundamentalFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFundamentalFacet.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDIdentityConstraintCategory.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDIdentityConstraintCategory.java
index eb4a2cb..e8dcab1 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDIdentityConstraintCategory.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDIdentityConstraintCategory.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDIdentityConstraintDefinition.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDIdentityConstraintDefinition.java
index 1717244..0c826cd 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDIdentityConstraintDefinition.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDIdentityConstraintDefinition.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDImport.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDImport.java
index 28b968e..7827e8d 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDImport.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDImport.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDInclude.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDInclude.java
index 8982fc7..413bfae 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDInclude.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDInclude.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDLengthFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDLengthFacet.java
index 2ab1825..8dbd744 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDLengthFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDLengthFacet.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMaxExclusiveFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMaxExclusiveFacet.java
index 960f871..81284de 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMaxExclusiveFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMaxExclusiveFacet.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMaxFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMaxFacet.java
index fbd6252..6daf394 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMaxFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMaxFacet.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMaxInclusiveFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMaxInclusiveFacet.java
index 2d82835..d30cd32 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMaxInclusiveFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMaxInclusiveFacet.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMaxLengthFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMaxLengthFacet.java
index 5e7381e..649fa9f 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMaxLengthFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMaxLengthFacet.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMinExclusiveFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMinExclusiveFacet.java
index ded3be2..021988f 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMinExclusiveFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMinExclusiveFacet.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMinFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMinFacet.java
index 4e26982..a58e725 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMinFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMinFacet.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMinInclusiveFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMinInclusiveFacet.java
index 64fe6b5..c04c8fb 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMinInclusiveFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMinInclusiveFacet.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMinLengthFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMinLengthFacet.java
index f23538b..469e390 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMinLengthFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMinLengthFacet.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDModelGroup.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDModelGroup.java
index f8672e5..acca503 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDModelGroup.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDModelGroup.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDModelGroupDefinition.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDModelGroupDefinition.java
index 412b23a..433ef76 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDModelGroupDefinition.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDModelGroupDefinition.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNamedComponent.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNamedComponent.java
index 8edf08a..026f660 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNamedComponent.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNamedComponent.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNamespaceConstraintCategory.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNamespaceConstraintCategory.java
index 0b6ae73..d6e0881 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNamespaceConstraintCategory.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNamespaceConstraintCategory.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNotationDeclaration.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNotationDeclaration.java
index 28caaec..6681e59 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNotationDeclaration.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNotationDeclaration.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNumericFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNumericFacet.java
index 0e26165..189ad1b 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNumericFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNumericFacet.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDOrdered.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDOrdered.java
index 889fadd..38764a1 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDOrdered.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDOrdered.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDOrderedFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDOrderedFacet.java
index 0461a5f..ef6e819 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDOrderedFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDOrderedFacet.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDPackage.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDPackage.java
index f29545f..25fbc7c 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDPackage.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDPackage.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDParticle.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDParticle.java
index e2d859f..03e98b4 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDParticle.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDParticle.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDParticleContent.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDParticleContent.java
index 4addcde..64b4085 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDParticleContent.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDParticleContent.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDPatternFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDPatternFacet.java
index 84c802b..be8ce62 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDPatternFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDPatternFacet.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDPlugin.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDPlugin.java
index c4baf00..04e120f 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDPlugin.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDPlugin.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDProcessContents.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDProcessContents.java
index ace85dc..694e290 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDProcessContents.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDProcessContents.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDProhibitedSubstitutions.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDProhibitedSubstitutions.java
index 118c0be..96ec47c 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDProhibitedSubstitutions.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDProhibitedSubstitutions.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRedefinableComponent.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRedefinableComponent.java
index d919805..48f829b 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRedefinableComponent.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRedefinableComponent.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRedefine.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRedefine.java
index c2e6cff..709d325 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRedefine.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRedefine.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRedefineContent.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRedefineContent.java
index 2f5468b..e7c031a 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRedefineContent.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRedefineContent.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRepeatableFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRepeatableFacet.java
index c3ef6a1..2ea1d5b 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRepeatableFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRepeatableFacet.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchema.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchema.java
index de0ab6c..91b403b 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchema.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchema.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchemaCompositor.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchemaCompositor.java
index 7139c1f..348085a 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchemaCompositor.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchemaCompositor.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchemaContent.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchemaContent.java
index b5b4400..4c0f869 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchemaContent.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchemaContent.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchemaDirective.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchemaDirective.java
index 6aee1e1..ac563e1 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchemaDirective.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchemaDirective.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDScope.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDScope.java
index c17eef3..075ffc0 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDScope.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDScope.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSimpleFinal.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSimpleFinal.java
index 658b53c..6a7a5ff 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSimpleFinal.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSimpleFinal.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSimpleTypeDefinition.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSimpleTypeDefinition.java
index a736931..013d7a7 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSimpleTypeDefinition.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSimpleTypeDefinition.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSubstitutionGroupExclusions.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSubstitutionGroupExclusions.java
index 268cb47..0527559 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSubstitutionGroupExclusions.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSubstitutionGroupExclusions.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDTerm.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDTerm.java
index 50ceb11..7b10b0d 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDTerm.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDTerm.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDTotalDigitsFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDTotalDigitsFacet.java
index d910367..e51f2b3 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDTotalDigitsFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDTotalDigitsFacet.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDTypeDefinition.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDTypeDefinition.java
index 25a9638..bd96853 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDTypeDefinition.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDTypeDefinition.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDVariety.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDVariety.java
index 4497b4e..99549b9 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDVariety.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDVariety.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDWhiteSpace.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDWhiteSpace.java
index 16eb01b..47f73ea 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDWhiteSpace.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDWhiteSpace.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDWhiteSpaceFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDWhiteSpaceFacet.java
index a0d8d70..5d1ff00 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDWhiteSpaceFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDWhiteSpaceFacet.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDWildcard.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDWildcard.java
index 84f421c..b254548 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDWildcard.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDWildcard.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDXPathDefinition.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDXPathDefinition.java
index 80b5e2b..eb7b59b 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDXPathDefinition.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDXPathDefinition.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDXPathVariety.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDXPathVariety.java
index 74528b4..ee2140c 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDXPathVariety.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDXPathVariety.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/EcoreSchemaBuilder.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/EcoreSchemaBuilder.java
index 097c879..e6202ed 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/EcoreSchemaBuilder.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/EcoreSchemaBuilder.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2005-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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/EcoreXMISchemaBuilder.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/EcoreXMISchemaBuilder.java
index cdc2428..3020e70 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/EcoreXMISchemaBuilder.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/EcoreXMISchemaBuilder.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/EcoreXMLSchemaBuilder.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/EcoreXMLSchemaBuilder.java
index 3c6b804..6942eda 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/EcoreXMLSchemaBuilder.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/EcoreXMLSchemaBuilder.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/MapBuilder.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/MapBuilder.java
index 54da449..01d6bc2 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/MapBuilder.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/MapBuilder.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/NameMangler.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/NameMangler.java
index 17c5ffa..f05ca7f 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/NameMangler.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/NameMangler.java
@@ -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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/XSDEcoreBuilder.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/XSDEcoreBuilder.java
index 2baef45..f7ebe85 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/XSDEcoreBuilder.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/XSDEcoreBuilder.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/package.html b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/package.html
index f1837a7..4a092ae 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/package.html
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/package.html
@@ -6,9 +6,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAnnotationImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAnnotationImpl.java
index a89fedd..94f3b9a 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAnnotationImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAnnotationImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeDeclarationImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeDeclarationImpl.java
index aa003c6..b058bfe 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeDeclarationImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeDeclarationImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeGroupContentImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeGroupContentImpl.java
index 5f74f36..99b4a79 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeGroupContentImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeGroupContentImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeGroupDefinitionImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeGroupDefinitionImpl.java
index bf26ed7..97c9fb6 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeGroupDefinitionImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeGroupDefinitionImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeUseImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeUseImpl.java
index 2441f43..dad4e0d 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeUseImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeUseImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDBoundedFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDBoundedFacetImpl.java
index 670b797..6c4a03c 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDBoundedFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDBoundedFacetImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDCardinalityFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDCardinalityFacetImpl.java
index 7edbcbe..965747e 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDCardinalityFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDCardinalityFacetImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComplexTypeContentImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComplexTypeContentImpl.java
index 06f9ba8..88ef0de 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComplexTypeContentImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComplexTypeContentImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComplexTypeDefinitionImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComplexTypeDefinitionImpl.java
index e121607..4371dfa 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComplexTypeDefinitionImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComplexTypeDefinitionImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComponentImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComponentImpl.java
index ce8ee63..f1899c3 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComponentImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComponentImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDConcreteComponentImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDConcreteComponentImpl.java
index 267a3f5..5ee3e79 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDConcreteComponentImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDConcreteComponentImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDConstrainingFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDConstrainingFacetImpl.java
index 679c689..c96631d 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDConstrainingFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDConstrainingFacetImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDDiagnosticImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDDiagnosticImpl.java
index 0fa20f8..946437f 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDDiagnosticImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDDiagnosticImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDElementDeclarationImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDElementDeclarationImpl.java
index ee89d43..e4507e3 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDElementDeclarationImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDElementDeclarationImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDEnumerationFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDEnumerationFacetImpl.java
index c95a87a..6837fd1 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDEnumerationFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDEnumerationFacetImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFacetImpl.java
index 372818c..f0a6e16 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFacetImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFactoryImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFactoryImpl.java
index 1394df6..d3d7bde 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFactoryImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFactoryImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFeatureImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFeatureImpl.java
index d7e73d1..e0e6760 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFeatureImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFeatureImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFixedFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFixedFacetImpl.java
index c0ff842..ba5c1d3 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFixedFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFixedFacetImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFractionDigitsFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFractionDigitsFacetImpl.java
index de8eb65..b9c3aae 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFractionDigitsFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFractionDigitsFacetImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFundamentalFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFundamentalFacetImpl.java
index ae177c2..a800c4c 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFundamentalFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFundamentalFacetImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDIdentityConstraintDefinitionImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDIdentityConstraintDefinitionImpl.java
index a9f33ce..34b5140 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDIdentityConstraintDefinitionImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDIdentityConstraintDefinitionImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDImportImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDImportImpl.java
index f93e312..f3dee6a 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDImportImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDImportImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDIncludeImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDIncludeImpl.java
index 4b18305..b360d4b 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDIncludeImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDIncludeImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDLengthFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDLengthFacetImpl.java
index 20cea8d..e58068a 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDLengthFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDLengthFacetImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxExclusiveFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxExclusiveFacetImpl.java
index 33e887c..01fb1e4 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxExclusiveFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxExclusiveFacetImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxFacetImpl.java
index ecb90ae..f2253cc 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxFacetImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxInclusiveFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxInclusiveFacetImpl.java
index 53f149f..380e91c 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxInclusiveFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxInclusiveFacetImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxLengthFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxLengthFacetImpl.java
index 519fcf6..0f513d2 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxLengthFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxLengthFacetImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinExclusiveFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinExclusiveFacetImpl.java
index 78ef0c5..02fb2cd 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinExclusiveFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinExclusiveFacetImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinFacetImpl.java
index df13846..3b53908 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinFacetImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinInclusiveFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinInclusiveFacetImpl.java
index bbbb62e..b09284a 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinInclusiveFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinInclusiveFacetImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinLengthFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinLengthFacetImpl.java
index 90d51f6..fec9eb0 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinLengthFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinLengthFacetImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDModelGroupDefinitionImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDModelGroupDefinitionImpl.java
index 118d80b..521f0f0 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDModelGroupDefinitionImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDModelGroupDefinitionImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDModelGroupImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDModelGroupImpl.java
index f3dd096..e82682f 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDModelGroupImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDModelGroupImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNamedComponentImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNamedComponentImpl.java
index ac402d1..aeb06fb 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNamedComponentImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNamedComponentImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNotationDeclarationImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNotationDeclarationImpl.java
index 74cd554..d0f44b2 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNotationDeclarationImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNotationDeclarationImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNumericFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNumericFacetImpl.java
index 3f8f2ee..cd31264 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNumericFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNumericFacetImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDOrderedFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDOrderedFacetImpl.java
index aa81464..7421421 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDOrderedFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDOrderedFacetImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDPackageImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDPackageImpl.java
index 3ab5878..6b54462 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDPackageImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDPackageImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDParticleContentImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDParticleContentImpl.java
index e1c03d1..003c6a6 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDParticleContentImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDParticleContentImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDParticleImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDParticleImpl.java
index e9794fc..e3285ab 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDParticleImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDParticleImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDPatternFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDPatternFacetImpl.java
index 3adf4c1..19934f8 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDPatternFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDPatternFacetImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRedefinableComponentImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRedefinableComponentImpl.java
index 0423d15..3d31f4a 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRedefinableComponentImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRedefinableComponentImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRedefineContentImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRedefineContentImpl.java
index 10387e8..2eb0abd 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRedefineContentImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRedefineContentImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRedefineImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRedefineImpl.java
index a1a4393..3709fa7 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRedefineImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRedefineImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRepeatableFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRepeatableFacetImpl.java
index 919df92..8bcb3e1 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRepeatableFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRepeatableFacetImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaCompositorImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaCompositorImpl.java
index 9b5055e..795dfe6 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaCompositorImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaCompositorImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaContentImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaContentImpl.java
index ebaaa91..4bb569a 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaContentImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaContentImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaDirectiveImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaDirectiveImpl.java
index 3aa28ae..1796e9c 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaDirectiveImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaDirectiveImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaImpl.java
index 2368f65..f64a3f8 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDScopeImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDScopeImpl.java
index 43cd3d3..017d34a 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDScopeImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDScopeImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSimpleTypeDefinitionImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSimpleTypeDefinitionImpl.java
index 199ecbc..d46182c 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSimpleTypeDefinitionImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSimpleTypeDefinitionImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTermImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTermImpl.java
index 7954b1e..01ee05f 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTermImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTermImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTotalDigitsFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTotalDigitsFacetImpl.java
index 17843c8..fafc176 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTotalDigitsFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTotalDigitsFacetImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTypeDefinitionImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTypeDefinitionImpl.java
index cd0c622..063677a 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTypeDefinitionImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTypeDefinitionImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDWhiteSpaceFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDWhiteSpaceFacetImpl.java
index 7b07842..b57b018 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDWhiteSpaceFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDWhiteSpaceFacetImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDWildcardImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDWildcardImpl.java
index 1460e9e..6dea226 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDWildcardImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDWildcardImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDXPathDefinitionImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDXPathDefinitionImpl.java
index 04bb112..80321af 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDXPathDefinitionImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDXPathDefinitionImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/package.html b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/package.html
index d6fa7a6..f08bccc 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/package.html
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/package.html
@@ -6,9 +6,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDAnySimpleType.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDAnySimpleType.java
index b94d63b..b1300e0 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDAnySimpleType.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDAnySimpleType.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDAnyURIType.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDAnyURIType.java
index 9bbfc8e..83f821a 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDAnyURIType.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDAnyURIType.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDBase64BinaryType.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDBase64BinaryType.java
index 753fe5d..a7e6660 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDBase64BinaryType.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDBase64BinaryType.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDBooleanType.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDBooleanType.java
index 42df446..46c68bd 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDBooleanType.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDBooleanType.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDDateTimeType.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDDateTimeType.java
index 89f05a1..104684a 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDDateTimeType.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDDateTimeType.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDDateType.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDDateType.java
index 4f0a688..97515da 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDDateType.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDDateType.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDDecimalType.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDDecimalType.java
index 4689297..8ab2948 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDDecimalType.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDDecimalType.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDDoubleType.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDDoubleType.java
index 95770a9..9c3a7c5 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDDoubleType.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDDoubleType.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDDurationType.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDDurationType.java
index 94db25c..29113a7 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDDurationType.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDDurationType.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDFloatType.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDFloatType.java
index 20e2a7a..174610f 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDFloatType.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDFloatType.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDGDayType.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDGDayType.java
index c412bb5..dc35da8 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDGDayType.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDGDayType.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDGMonthDayType.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDGMonthDayType.java
index 36ccc10..484f1d9 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDGMonthDayType.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDGMonthDayType.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDGMonthType.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDGMonthType.java
index ecb599b..9c7faac 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDGMonthType.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDGMonthType.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDGYearMonthType.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDGYearMonthType.java
index ad7f1ef..da06ab7 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDGYearMonthType.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDGYearMonthType.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDGYearType.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDGYearType.java
index dc0e4e0..d106942 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDGYearType.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDGYearType.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDHexBinaryType.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDHexBinaryType.java
index 6791f34..01cc19e 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDHexBinaryType.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDHexBinaryType.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDNotationType.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDNotationType.java
index 2fecce7..edfbb04 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDNotationType.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDNotationType.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDQNameType.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDQNameType.java
index 7e6273b..2382ddb 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDQNameType.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDQNameType.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDTimeType.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDTimeType.java
index ac037da..7d12a56 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDTimeType.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDTimeType.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDTypeRegister.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDTypeRegister.java
index 4c1c94a..5644fc1 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDTypeRegister.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/XSDTypeRegister.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/package.html b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/package.html
index dfb65f8..2f7f0f4 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/package.html
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/type/package.html
@@ -6,9 +6,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/package.html b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/package.html
index d880127..2d7de43 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/package.html
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/package.html
@@ -6,9 +6,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/DefaultErrorHandler.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/DefaultErrorHandler.java
index 6c42519..7a21f71 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/DefaultErrorHandler.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/DefaultErrorHandler.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/DefaultJAXPConfiguration.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/DefaultJAXPConfiguration.java
index bfde00f..bef0883 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/DefaultJAXPConfiguration.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/DefaultJAXPConfiguration.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/DefaultJAXPPool.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/DefaultJAXPPool.java
index dcb4688..871e39c 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/DefaultJAXPPool.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/DefaultJAXPPool.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/JAXPConfiguration.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/JAXPConfiguration.java
index e945b2a..d569583 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/JAXPConfiguration.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/JAXPConfiguration.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/JAXPPool.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/JAXPPool.java
index e96488f..616a8d6 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/JAXPPool.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/JAXPPool.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDAdapterFactory.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDAdapterFactory.java
index 08836f2..c2d6954 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDAdapterFactory.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDAdapterFactory.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDConstants.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDConstants.java
index 1bfd6a9..9404ed7 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDConstants.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDConstants.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDParser.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDParser.java
index 3dce185..3158258 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDParser.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDParser.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDPrototypicalSchema.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDPrototypicalSchema.java
index 63cfda6..b93f1c3 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDPrototypicalSchema.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDPrototypicalSchema.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDResourceFactoryImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDResourceFactoryImpl.java
index ffcaa37..eb385b6 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDResourceFactoryImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDResourceFactoryImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDResourceImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDResourceImpl.java
index 16d6947..1683745 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDResourceImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDResourceImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDSchemaBuildingTools.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDSchemaBuildingTools.java
index fd9e9cd..a84ca00 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDSchemaBuildingTools.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDSchemaBuildingTools.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDSchemaLocationResolver.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDSchemaLocationResolver.java
index 35c54c6..3175197 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDSchemaLocationResolver.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDSchemaLocationResolver.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDSchemaLocator.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDSchemaLocator.java
index e1afd16..934ad62 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDSchemaLocator.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDSchemaLocator.java
@@ -1,9 +1,9 @@
 /**
  * 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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDSchemaQueryTools.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDSchemaQueryTools.java
index eff199b..5c626ca 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDSchemaQueryTools.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDSchemaQueryTools.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDSwitch.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDSwitch.java
index c169499..3348000 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDSwitch.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDSwitch.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDUtil.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDUtil.java
index fc97384..b16524f 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDUtil.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDUtil.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2002-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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/package.html b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/package.html
index fe34cc0..61dc208 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/package.html
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/package.html
@@ -6,9 +6,9 @@
 /**
  * Copyright (c) 2002-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
+ * 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
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation