Move to epl 2.0

Change-Id: I68dd9c4b6937d9d5e2fd16f148c1351925f898ad
Signed-off-by: Thomas Guiu <thomas.guiu@soyatec.com>
diff --git a/deprecated/3.3/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties b/deprecated/3.3/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties
index eccc9da..fac9b36 100644
--- a/deprecated/3.3/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties
+++ b/deprecated/3.3/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -11,10 +14,10 @@
 
 # NLS_MESSAGEFORMAT_VAR
 bin.includes = feature.*,\
-	           epl-v10.html,\
+	           epl-2.0.html,\
 	           license.html,\
                eclipse_update_120.jpg
-src.includes = epl-v10.html,\
+src.includes = epl-2.0.html,\
                license.html
 root=rootfiles
 	               
\ No newline at end of file
diff --git a/deprecated/3.3/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties b/deprecated/3.3/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties
index a909bce..ea7a5f4 100644
--- a/deprecated/3.3/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties
+++ b/deprecated/3.3/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -32,125 +35,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/build.properties b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/build.properties
index c0f53db..e1caa55 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/build.properties
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java
index c5abaae..c129856 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java
@@ -142,10 +142,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
@@ -171,7 +173,7 @@
 
 		stringBuffer.append(TEXT_2);
 		stringBuffer.append(pluginClassesLocation);
-		stringBuffer.append(TEXT_3);
+		stringBuffer.append(TEXT_3); 
 		if (genModel.isBundleManifest()) {
 			stringBuffer.append(TEXT_4);
 		}
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java
index 83f0e64..e021c60 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java
@@ -315,12 +315,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java
index 8e92372..36ca494 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java
@@ -213,12 +213,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java
index cc9b46b..cbdd8f0 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java
@@ -161,12 +161,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java
index a75b51e..fbe6128 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java
@@ -155,10 +155,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java
index 892c59e..c0c5235 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java
@@ -166,10 +166,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java
index adce764..8d4f034 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java
@@ -380,12 +380,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java
index 86623ff..ad856c0 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java
@@ -204,12 +204,14 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java
index bf465cf..10a76f6 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java
@@ -142,10 +142,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java
index c069c4a..af25396 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java
@@ -461,12 +461,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java
index 2d9f4ee..49e0681 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java
@@ -151,10 +151,12 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java
index 9e6cd23..f82412a 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java
@@ -372,12 +372,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java
index 18cf65e..9b2057e 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java
@@ -161,12 +161,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java
index e7a898a..fc6675f 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java
@@ -171,10 +171,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java
index 86c2a26..0982030 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java
@@ -206,10 +206,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java
index 708ce3f..378d453 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java
@@ -171,12 +171,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java
index 6ca6795..8784b22 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java
@@ -143,10 +143,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java
index a12ce94..1f795d5 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java
@@ -524,12 +524,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java
index 7f2b4d2..c66e5f2 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java
@@ -245,12 +245,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java
index 4a2f078..bed8b00 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java
@@ -555,12 +555,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java
index f79c21d..4773e40 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java
@@ -555,12 +555,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java
index 8c211b6..ba1fae7 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java
@@ -524,12 +524,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java
index a57c2b7..79d911f 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java
@@ -152,10 +152,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java
index 0621d5d..ecf3860 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java
@@ -716,12 +716,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java
index 30116ad..71dd3b6 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java
@@ -716,12 +716,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java
index 3a1d666..c9e7848 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java
@@ -158,12 +158,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java
index 205dccb..9308dca 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java
@@ -135,10 +135,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java
index f35f1c7..e20e6d6 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java
@@ -164,10 +164,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java
index f90d899..ced96e2 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java
@@ -331,12 +331,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java
index 4b3b298..4276248 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java
@@ -165,12 +165,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java
index a9693c2..06a85be 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java
@@ -188,12 +188,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java
index faef493..37241eb 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java
@@ -609,12 +609,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java
index 688f69f..9bf40ac 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java
@@ -164,12 +164,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java
index 51575ae..26ae318 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java
@@ -142,10 +142,12 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java
index ec1ea3d..f9360c7 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java
@@ -150,10 +150,12 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java
index 8cd3f4d..e446079 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java
@@ -155,12 +155,14 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java
index 30f334e..f7b8edf 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java
@@ -208,12 +208,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java
index 9cec7a2..cceaebd 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java
@@ -155,12 +155,14 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java
index 47230bd..c5923d2 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java
@@ -135,10 +135,12 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java
index 2a2a97e..ecd27c7 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java
@@ -150,10 +150,12 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java
index bddaac0..a8414da 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java
@@ -200,12 +200,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/plugin.properties b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/plugin.properties
index 3747c7c..c8b055e 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/plugin.properties
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/plugin.xml b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/plugin.xml
index 9468fb4..2fced3b 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/plugin.xml
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.emf.pattern/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties b/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties
index 4175cf4..29c2342 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java b/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java
index 19acd5a..87cc60e 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java b/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java
index 647b614..5a47fec 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java b/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java
index 9f02ca8..f2bcf31 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties b/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties
index 21ee128..b9ce33b 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java b/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java
index 7d71074..073eb81 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java b/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java
index 9efdb6d..94bf388 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java b/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java
index e39ab27..3e69050 100644
--- a/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java
+++ b/deprecated/3.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.5/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties b/deprecated/3.5/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties
index eccc9da..fac9b36 100644
--- a/deprecated/3.5/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties
+++ b/deprecated/3.5/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -11,10 +14,10 @@
 
 # NLS_MESSAGEFORMAT_VAR
 bin.includes = feature.*,\
-	           epl-v10.html,\
+	           epl-2.0.html,\
 	           license.html,\
                eclipse_update_120.jpg
-src.includes = epl-v10.html,\
+src.includes = epl-2.0.html,\
                license.html
 root=rootfiles
 	               
\ No newline at end of file
diff --git a/deprecated/3.5/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties b/deprecated/3.5/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties
index a909bce..2bfe16e 100644
--- a/deprecated/3.5/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties
+++ b/deprecated/3.5/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -32,125 +35,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/build.properties b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/build.properties
index c0f53db..e1caa55 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/build.properties
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java
index cc2d09b..df52570 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java
@@ -143,10 +143,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java
index ea281d9..6c09f0d 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java
@@ -238,12 +238,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java
index 4014044..ac1de67 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java
@@ -261,12 +261,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java
index 82261df..0b01a5a 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java
@@ -161,12 +161,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java
index f466040..e306a94 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java
@@ -155,10 +155,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java
index 42b8868..14427f2 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java
@@ -185,10 +185,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java
index d70ac12..435ae1e 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java
@@ -380,12 +380,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java
index 12118af..c4bc196 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java
@@ -219,12 +219,14 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2004-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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java
index fc064bd..9c09fb7 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java
@@ -143,10 +143,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java
index af60be5..649cf0d 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java
@@ -500,12 +500,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java
index b5c75a2..c1e1818 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java
@@ -152,10 +152,12 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java
index bc16c9a..f761465 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java
@@ -371,12 +371,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java
index 833ccce..54b63b2 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java
@@ -161,12 +161,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java
index 4975a85..a775e11 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java
@@ -171,10 +171,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java
index 98eaf66..5a5494f 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java
@@ -228,10 +228,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java
index eacba55..9f73205 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java
@@ -173,12 +173,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java
index c03daac..b86b461 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java
@@ -144,10 +144,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java
index 38439d0..704773f 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java
@@ -543,12 +543,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java
index d4034b2..41a6d7f 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java
@@ -246,12 +246,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java
index 01b0bad..e5b5f8d 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java
@@ -565,12 +565,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java
index 4e20c47..5772965 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java
@@ -565,12 +565,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java
index 2d565af..0c44123 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java
@@ -543,12 +543,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java
index c6ebccf..04d31d5 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java
@@ -153,10 +153,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java
index ee9f5ad..3086ea8 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java
@@ -734,12 +734,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java
index b7afeb0..a196977 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java
@@ -734,12 +734,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java
index 3a1d666..c9e7848 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java
@@ -158,12 +158,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java
index e1101e1..6d32465 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java
@@ -140,10 +140,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java
index a41558b..62e7e5a 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java
@@ -176,10 +176,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java
index 061a0a2..4135394 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java
@@ -331,12 +331,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java
index 4b3b298..4276248 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java
@@ -165,12 +165,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java
index ce3370b..ae4ccd7 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java
@@ -188,12 +188,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java
index f451236..ea50980 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java
@@ -689,12 +689,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java
index 688f69f..9bf40ac 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java
@@ -164,12 +164,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java
index 9d65701..d91d9e4 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java
@@ -144,10 +144,12 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005-2008 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java
index a78e78d..293aa78 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java
@@ -151,10 +151,12 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java
index 722486f..cc128fa 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java
@@ -155,12 +155,14 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java
index 5170f23..72cd1c9 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java
@@ -224,12 +224,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java
index a07fe30..756d30c 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java
@@ -155,12 +155,14 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java
index 9619f94..d678e42 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java
@@ -135,10 +135,12 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java
index f589043..2d9e47b 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java
@@ -150,10 +150,12 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java
index fce132c..910661d 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java
@@ -207,12 +207,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/plugin.properties b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/plugin.properties
index 3747c7c..c8b055e 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/plugin.properties
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/plugin.xml b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/plugin.xml
index 9468fb4..2fced3b 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/plugin.xml
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.emf.pattern/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties b/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties
index 4175cf4..29c2342 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java b/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java
index 19acd5a..87cc60e 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java b/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java
index 647b614..5a47fec 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java b/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java
index 9f02ca8..f2bcf31 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties b/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties
index 21ee128..b9ce33b 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java b/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java
index 7d71074..073eb81 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java b/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java
index 9efdb6d..94bf388 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java b/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java
index e39ab27..3e69050 100644
--- a/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java
+++ b/deprecated/3.5/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.6/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties b/deprecated/3.6/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties
index eccc9da..fac9b36 100644
--- a/deprecated/3.6/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties
+++ b/deprecated/3.6/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -11,10 +14,10 @@
 
 # NLS_MESSAGEFORMAT_VAR
 bin.includes = feature.*,\
-	           epl-v10.html,\
+	           epl-2.0.html,\
 	           license.html,\
                eclipse_update_120.jpg
-src.includes = epl-v10.html,\
+src.includes = epl-2.0.html,\
                license.html
 root=rootfiles
 	               
\ No newline at end of file
diff --git a/deprecated/3.6/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties b/deprecated/3.6/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties
index a909bce..2bfe16e 100644
--- a/deprecated/3.6/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties
+++ b/deprecated/3.6/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -32,125 +35,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/build.properties b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/build.properties
index c0f53db..e1caa55 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/build.properties
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java
index ed8fe1b..17c8e36 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java
@@ -145,10 +145,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java
index 174c8b5..407d38c 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java
@@ -146,12 +146,14 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2010 Ed Merks and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   Ed Merks - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java
index 93edb0a..fc1c9ae 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java
@@ -241,12 +241,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java
index 4117713..0bdd9fb 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java
@@ -266,12 +266,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java
index 85be38a..8a3fe70 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java
@@ -218,12 +218,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java
index 5f43848..042584c 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java
@@ -155,10 +155,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java
index 4afa26e..3459923 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java
@@ -185,10 +185,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java
index bce0f95..ab1444d 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java
@@ -177,12 +177,14 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2010 Ed Merks and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   Ed Merks - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java
index 32ce705..9a9ec79 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java
@@ -380,12 +380,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java
index ed30d89..75c14e5 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java
@@ -229,12 +229,14 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2004-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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java
index 45bea16..db4eca4 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java
@@ -143,10 +143,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java
index 63c8958..fb66e28 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java
@@ -512,12 +512,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java
index 3c9e02a..4f5aacd 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java
@@ -154,10 +154,12 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005-2010 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java
index fbce7db..984b916 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java
@@ -377,12 +377,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java
index 6d5506f..0872d09 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java
@@ -161,12 +161,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java
index 166fab5..e69c13a 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java
@@ -171,10 +171,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java
index c21144a..aa7b4f4 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java
@@ -234,10 +234,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java
index 59b08f3..9aca6d6 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java
@@ -145,10 +145,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java
index 6b07893..3c3dc52 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java
@@ -618,12 +618,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java
index 36b18dc..688d174 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java
@@ -246,12 +246,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java
index e582f73..c8cc268 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java
@@ -573,12 +573,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java
index c154ab0..c8aaf65 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java
@@ -573,12 +573,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java
index e036252..384db76 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java
@@ -618,12 +618,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java
index 594c378..86de0aa 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java
@@ -153,10 +153,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java
index fd111e9..6e70768 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java
@@ -820,12 +820,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java
index 5f8f204..78235db 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java
@@ -820,12 +820,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java
index c21de4e..ed97fac 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java
@@ -165,12 +165,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java
index ba5469f..a798a7d 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java
@@ -140,10 +140,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java
index 042f922..a6a4dbf 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java
@@ -176,10 +176,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java
index 56c5c0b..e9db601 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java
@@ -331,12 +331,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java
index d027446..0342ef6 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java
@@ -165,12 +165,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java
index 69baadc..f78e2e9 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java
@@ -188,12 +188,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java
index 8173dc0..fbfdbbf 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java
@@ -736,12 +736,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java
index 81ea07f..57890f4 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java
@@ -164,12 +164,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java
index 84fbacb..fbcccff 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java
@@ -144,10 +144,12 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005-2008 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java
index 28ca459..bfec18a 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java
@@ -151,10 +151,12 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java
index 2ef97a7..4c3baa7 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java
@@ -155,12 +155,14 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java
index ce00961..52f649b 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java
@@ -225,12 +225,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java
index 0439715..3c8f089 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java
@@ -155,12 +155,14 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java
index 9ce2546..1b24839 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java
@@ -135,10 +135,12 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java
index f22e5cf..3aaae05 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java
@@ -150,10 +150,12 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java
index 217dc46..c01afcd 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java
@@ -207,12 +207,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/plugin.properties b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/plugin.properties
index 3747c7c..c8b055e 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/plugin.properties
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/plugin.xml b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/plugin.xml
index 9468fb4..2fced3b 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/plugin.xml
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.emf.pattern/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties b/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties
index 4175cf4..29c2342 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java b/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java
index 19acd5a..87cc60e 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java b/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java
index 647b614..5a47fec 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java b/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java
index 9f02ca8..f2bcf31 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties b/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties
index 21ee128..b9ce33b 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java b/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java
index 7d71074..073eb81 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java b/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java
index 9efdb6d..94bf388 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java b/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java
index e39ab27..3e69050 100644
--- a/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java
+++ b/deprecated/3.6/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.7/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties b/deprecated/3.7/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties
index eccc9da..fac9b36 100644
--- a/deprecated/3.7/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties
+++ b/deprecated/3.7/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -11,10 +14,10 @@
 
 # NLS_MESSAGEFORMAT_VAR
 bin.includes = feature.*,\
-	           epl-v10.html,\
+	           epl-2.0.html,\
 	           license.html,\
                eclipse_update_120.jpg
-src.includes = epl-v10.html,\
+src.includes = epl-2.0.html,\
                license.html
 root=rootfiles
 	               
\ No newline at end of file
diff --git a/deprecated/3.7/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties b/deprecated/3.7/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties
index a909bce..2bfe16e 100644
--- a/deprecated/3.7/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties
+++ b/deprecated/3.7/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -32,125 +35,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/build.properties b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/build.properties
index c0f53db..e1caa55 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/build.properties
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java
index b553757..77e5605 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java
@@ -145,10 +145,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java
index 216273f..1211c3c 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java
@@ -146,12 +146,14 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2010 Ed Merks and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   Ed Merks - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java
index d1ebe1a..1bd3dac 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java
@@ -241,12 +241,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java
index 5829e1f..791f5f6 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java
@@ -266,12 +266,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java
index 212b54d..67ac37d 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java
@@ -218,12 +218,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java
index 7d4452a..1ec8539 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java
@@ -156,10 +156,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java
index d68d6a4..03e6e12 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java
@@ -185,10 +185,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java
index 2d1b74f..db505e9 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java
@@ -177,12 +177,14 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2010 Ed Merks and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   Ed Merks - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java
index 146bdc7..af62a2e 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java
@@ -380,12 +380,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java
index e79098d..a73a082 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java
@@ -229,12 +229,14 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2004-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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java
index d9553e8..d53b99d 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java
@@ -147,10 +147,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java
index 62d6469..dd8916d 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java
@@ -512,12 +512,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/EntryPoint.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/EntryPoint.java
index 7521d52..b4f1f87 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/EntryPoint.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/EntryPoint.java
@@ -156,12 +156,14 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 20010 Ed Merks and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   Ed Merks - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java
index a83c761..4fe58c9 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java
@@ -155,10 +155,12 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005-2010 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java
index 8a05cb6..352400d 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java
@@ -377,12 +377,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java
index 7357dae..012637b 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java
@@ -168,12 +168,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java
index 5a4d25b..e2d9565 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java
@@ -172,10 +172,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java
index 45b0ee7..91ab367 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java
@@ -234,10 +234,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java
index 5ae1e82..6c9dc04 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java
@@ -173,12 +173,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java
index 069c1a0..cefbf05 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java
@@ -145,10 +145,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java
index 9c9a4b9..62623bf 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java
@@ -618,12 +618,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java
index 9866a00..f45a2f2 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java
@@ -246,12 +246,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java
index c3bf403..fbf8151 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java
@@ -573,12 +573,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java
index ea081c3..6f02193 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java
@@ -573,12 +573,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java
index ce50017..0e79852 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java
@@ -618,12 +618,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java
index cce0b33..eaa6f0a 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java
@@ -153,10 +153,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java
index adfd181..1901b1d 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java
@@ -820,12 +820,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java
index 5bd300c..1cb3a8e 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java
@@ -820,12 +820,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java
index 5fa9d6d..c827ebc 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java
@@ -165,12 +165,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java
index 288067f..4393c1b 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java
@@ -140,10 +140,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java
index 256b217..13a7f3d 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java
@@ -176,10 +176,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java
index 70a1030..88badd2 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java
@@ -331,12 +331,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java
index e37a301..c4d0695 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java
@@ -165,12 +165,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java
index 9d1f374..986b711 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java
@@ -196,12 +196,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java
index be165d1..ae36023 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java
@@ -737,12 +737,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java
index c87883e..df24afc 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java
@@ -164,12 +164,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java
index 4d50502..21caa28 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java
@@ -144,10 +144,12 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005-2008 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java
index 2c39270..cf9588b 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java
@@ -151,10 +151,12 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java
index 325ef39..ac5aaa6 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java
@@ -155,12 +155,14 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java
index ce83e3e..ed62edf 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java
@@ -225,12 +225,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java
index 3acc9fa..aa5b08d 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java
@@ -155,12 +155,14 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java
index d3268c7..0accc58 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java
@@ -135,10 +135,12 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java
index 682352d..84fb061 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java
@@ -150,10 +150,12 @@
 		 * <copyright>
 		 *
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java
index 2d286d6..36bd29c 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java
@@ -207,12 +207,14 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 *
 		 * </copyright>
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/plugin.properties b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/plugin.properties
index 3747c7c..c8b055e 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/plugin.properties
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/plugin.xml b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/plugin.xml
index 9468fb4..2fced3b 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/plugin.xml
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.emf.pattern/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties b/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties
index 4175cf4..29c2342 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java b/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java
index 19acd5a..87cc60e 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java b/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java
index 647b614..5a47fec 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java b/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java
index 9f02ca8..f2bcf31 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties b/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties
index 21ee128..b9ce33b 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java b/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java
index 7d71074..073eb81 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java b/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java
index 9efdb6d..94bf388 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java b/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java
index e39ab27..3e69050 100644
--- a/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java
+++ b/deprecated/3.7/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.8/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties b/deprecated/3.8/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties
index eccc9da..fac9b36 100644
--- a/deprecated/3.8/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties
+++ b/deprecated/3.8/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -11,10 +14,10 @@
 
 # NLS_MESSAGEFORMAT_VAR
 bin.includes = feature.*,\
-	           epl-v10.html,\
+	           epl-2.0.html,\
 	           license.html,\
                eclipse_update_120.jpg
-src.includes = epl-v10.html,\
+src.includes = epl-2.0.html,\
                license.html
 root=rootfiles
 	               
\ No newline at end of file
diff --git a/deprecated/3.8/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties b/deprecated/3.8/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties
index a909bce..2bfe16e 100644
--- a/deprecated/3.8/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties
+++ b/deprecated/3.8/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -32,125 +35,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/build.properties b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/build.properties
index c0f53db..e1caa55 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/build.properties
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java
index b38cdf5..d92c9eb 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java
@@ -144,10 +144,12 @@
 

         /**

          * Copyright (c) 2010 Ed Merks and others.

-         * All rights reserved.   This program and the accompanying materials

-         * are made available under the terms of the Eclipse Public License v1.0

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   Ed Merks - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java
index 2bd33fe..273a17a 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java
@@ -239,10 +239,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java
index 8169dae..988d6f0 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java
@@ -264,10 +264,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java
index 1c2b7c6..e70d6fa 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java
@@ -216,10 +216,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java
index 418d12a..73c387d 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java
@@ -175,10 +175,12 @@
 

         /**

          * Copyright (c) 2010 Ed Merks and others.

-         * All rights reserved.   This program and the accompanying materials

-         * are made available under the terms of the Eclipse Public License v1.0

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   Ed Merks - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java
index 541ec8a..78b88b8 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java
@@ -379,10 +379,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java
index 6bdf09b..96f6333 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java
@@ -227,10 +227,12 @@
 

         /**

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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java
index 58108d9..a1a7771 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java
@@ -510,10 +510,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/EntryPoint.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/EntryPoint.java
index 4eae8a0..ac082c7 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/EntryPoint.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/EntryPoint.java
@@ -154,10 +154,12 @@
 

         /**

          * Copyright (c) 20010 Ed Merks and others.

-         * All rights reserved.   This program and the accompanying materials

-         * are made available under the terms of the Eclipse Public License v1.0

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   Ed Merks - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java
index 0e24e1b..8b14445 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java
@@ -375,10 +375,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java
index dbbec6a..cb5722c 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java
@@ -166,10 +166,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java
index 81a23b8..31a9a1f 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java
@@ -171,10 +171,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java
index 756cd1d..86613fd 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java
@@ -600,10 +600,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java
index 80dca9c..202a55c 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java
@@ -244,10 +244,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java
index 57d5096..5e10c63 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java
@@ -595,10 +595,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java
index d48fddd..ed65d2f 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java
@@ -595,10 +595,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java
index f0e37c6..4b2cf67 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java
@@ -600,10 +600,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java
index cbeabcf..3d7dc70 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java
@@ -818,10 +818,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java
index 0170375..f9fd634 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java
@@ -818,10 +818,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java
index 9b4395a..c53fb1c 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java
@@ -163,10 +163,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java
index f0efc1b..3f3e99d 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java
@@ -329,10 +329,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java
index 2e7f91c..90deeb3 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java
@@ -163,10 +163,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java
index ad2a063..55d7ff9 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java
@@ -194,10 +194,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java
index 09f71de..859e499 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java
@@ -735,10 +735,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java
index 802acac..b9c0c7a 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java
@@ -162,10 +162,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java
index d3d372c..bf33143 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java
@@ -153,10 +153,12 @@
 

         /**

          * Copyright (c) 2005 IBM Corporation and others.

-         * All rights reserved.   This program and the accompanying materials

-         * are made available under the terms of the Eclipse Public License v1.0

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java
index 91acdec..2cd1f11 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java
@@ -223,10 +223,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java
index 0919fc0..9add071 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java
@@ -153,10 +153,12 @@
 

         /**

          * Copyright (c) 2005 IBM Corporation and others.

-         * All rights reserved.   This program and the accompanying materials

-         * are made available under the terms of the Eclipse Public License v1.0

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java
index 8c73000..ae4317e 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java
@@ -205,10 +205,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/plugin.properties b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/plugin.properties
index 3747c7c..c8b055e 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/plugin.properties
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/plugin.xml b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/plugin.xml
index 9468fb4..2fced3b 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/plugin.xml
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.emf.pattern/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties b/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties
index 4175cf4..29c2342 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java b/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java
index 19acd5a..87cc60e 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java b/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java
index 647b614..5a47fec 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java b/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java
index 9f02ca8..f2bcf31 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties b/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties
index 21ee128..b9ce33b 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java b/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java
index 7d71074..073eb81 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java b/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java
index 9efdb6d..94bf388 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java b/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java
index e39ab27..3e69050 100644
--- a/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java
+++ b/deprecated/3.8/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/4.3/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties b/deprecated/4.3/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties
index eccc9da..fac9b36 100644
--- a/deprecated/4.3/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties
+++ b/deprecated/4.3/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -11,10 +14,10 @@
 
 # NLS_MESSAGEFORMAT_VAR
 bin.includes = feature.*,\
-	           epl-v10.html,\
+	           epl-2.0.html,\
 	           license.html,\
                eclipse_update_120.jpg
-src.includes = epl-v10.html,\
+src.includes = epl-2.0.html,\
                license.html
 root=rootfiles
 	               
\ No newline at end of file
diff --git a/deprecated/4.3/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties b/deprecated/4.3/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties
index a909bce..2bfe16e 100644
--- a/deprecated/4.3/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties
+++ b/deprecated/4.3/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -32,125 +35,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/build.properties b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/build.properties
index c0f53db..e1caa55 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/build.properties
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java
index b7325c2..2854ea4 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java
@@ -144,10 +144,12 @@
 

         /**

          * Copyright (c) 2010 Ed Merks and others.

-         * All rights reserved.   This program and the accompanying materials

-         * are made available under the terms of the Eclipse Public License v1.0

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   Ed Merks - Initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java
index dbd520e..56d68a1 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java
@@ -239,10 +239,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java
index 468b25d..95709b90 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java
@@ -264,10 +264,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java
index e45d93a..9decf92 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java
@@ -216,10 +216,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java
index f7e4b4d..52fca08 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java
@@ -175,10 +175,12 @@
 

         /**

          * Copyright (c) 2010 Ed Merks and others.

-         * All rights reserved.   This program and the accompanying materials

-         * are made available under the terms of the Eclipse Public License v1.0

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   Ed Merks - Initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java
index e0024b9..5bc0d79 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java
@@ -383,10 +383,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java
index 29a564b..a532536 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java
@@ -227,10 +227,12 @@
 

         /**

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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java
index 744c792..cd902c0 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java
@@ -627,10 +627,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/EntryPoint.java b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/EntryPoint.java
index 752a17a..ac3024a 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/EntryPoint.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/EntryPoint.java
@@ -154,10 +154,12 @@
 

         /**

          * Copyright (c) 20010 Ed Merks and others.

-         * All rights reserved.   This program and the accompanying materials

-         * are made available under the terms of the Eclipse Public License v1.0

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   Ed Merks - Initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java
index 2dd9972..4abcb1a 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java
@@ -375,10 +375,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java
index 5c377a8..4be89c7 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java
@@ -166,10 +166,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java
index 3d37252..950c261 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java
@@ -171,10 +171,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java
index 3af7527..a83eb4f 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java
@@ -617,10 +617,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java
index 5843844..0ce8369 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java
@@ -244,10 +244,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java
index e420db6..0cfd9f8 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java
@@ -617,10 +617,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java
index e474d6f..c909982f 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java
@@ -818,10 +818,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java
index 08e9505..1b517da 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java
@@ -818,10 +818,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java
index 6e2fb46..7d2a4ea 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java
@@ -163,10 +163,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java
index 6fb477d..2dbd867 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java
@@ -329,10 +329,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java
index 57c6180..abd0edd 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java
@@ -163,10 +163,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java
index 2a2f93c..9487050 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java
@@ -205,10 +205,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java
index 08d94b8..c80b5a8 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java
@@ -736,10 +736,12 @@
 

         /**

          * Copyright (c) 2002-2013 IBM Corporation and others.

-         * All rights reserved.   This program and the accompanying materials

-         * are made available under the terms of the Eclipse Public License v1.0

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java
index 92ae390..a431946 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java
@@ -162,10 +162,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java
index c33cb56..b214091 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java
@@ -153,10 +153,12 @@
 

         /**

          * Copyright (c) 2005 IBM Corporation and others.

-         * All rights reserved.   This program and the accompanying materials

-         * are made available under the terms of the Eclipse Public License v1.0

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java
index e34a28e..256b9b3 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java
@@ -223,10 +223,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java
index 7faef22..dff3fe8 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java
@@ -153,10 +153,12 @@
 

         /**

          * Copyright (c) 2005 IBM Corporation and others.

-         * All rights reserved.   This program and the accompanying materials

-         * are made available under the terms of the Eclipse Public License v1.0

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java
index d299747..bb3aff0 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java
@@ -205,10 +205,12 @@
 

         /**

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/plugin.properties b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/plugin.properties
index 3747c7c..c8b055e 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/plugin.properties
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/plugin.xml b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/plugin.xml
index 9468fb4..2fced3b 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/plugin.xml
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.emf.pattern/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties b/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties
index 4175cf4..29c2342 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java b/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java
index 19acd5a..87cc60e 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java b/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java
index 647b614..5a47fec 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java b/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java
index 9f02ca8..f2bcf31 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties b/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties
index 21ee128..b9ce33b 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java b/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java
index 7d71074..073eb81 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java b/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java
index 9efdb6d..94bf388 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java b/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java
index e39ab27..3e69050 100644
--- a/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java
+++ b/deprecated/4.3/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/4.4/portfolio/org.eclipse.egf.emf.pattern/build.properties b/deprecated/4.4/portfolio/org.eclipse.egf.emf.pattern/build.properties
index c0f53db..e1caa55 100644
--- a/deprecated/4.4/portfolio/org.eclipse.egf.emf.pattern/build.properties
+++ b/deprecated/4.4/portfolio/org.eclipse.egf.emf.pattern/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/4.4/portfolio/org.eclipse.egf.emf.pattern/plugin.properties b/deprecated/4.4/portfolio/org.eclipse.egf.emf.pattern/plugin.properties
index 3747c7c..c8b055e 100644
--- a/deprecated/4.4/portfolio/org.eclipse.egf.emf.pattern/plugin.properties
+++ b/deprecated/4.4/portfolio/org.eclipse.egf.emf.pattern/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/4.4/portfolio/org.eclipse.egf.emf.pattern/plugin.xml b/deprecated/4.4/portfolio/org.eclipse.egf.emf.pattern/plugin.xml
index 9468fb4..2fced3b 100644
--- a/deprecated/4.4/portfolio/org.eclipse.egf.emf.pattern/plugin.xml
+++ b/deprecated/4.4/portfolio/org.eclipse.egf.emf.pattern/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties b/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties
index ab318bd..94d5f5b 100644
--- a/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties
+++ b/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java b/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java
index 2d55b6e..e7b6c30 100644
--- a/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java
+++ b/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2011 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java b/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java
index 88377e3..eb0d15a 100644
--- a/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java
+++ b/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2011 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateEdgeCommand.java b/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateEdgeCommand.java
index 944e4dd..76a738e 100644
--- a/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateEdgeCommand.java
+++ b/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateEdgeCommand.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2014 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateNodeCommand.java b/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateNodeCommand.java
index c7a1567..c3763b5 100644
--- a/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateNodeCommand.java
+++ b/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateNodeCommand.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2014 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/operation/CreateEcoreTools2RepresentationOperation.java b/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/operation/CreateEcoreTools2RepresentationOperation.java
index 0b56e68..0a6f17b 100644
--- a/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/operation/CreateEcoreTools2RepresentationOperation.java
+++ b/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/operation/CreateEcoreTools2RepresentationOperation.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2014 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java b/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java
index 1dbf352..2fe07d4 100644
--- a/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java
+++ b/deprecated/4.4/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2014 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/build.properties b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/build.properties
index 4757200..c7b9e37 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/build.properties
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java
index 867e885..6b979e6 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java
@@ -148,10 +148,12 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java
index 748e0fc..8a9d7a4 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java
@@ -149,12 +149,14 @@
 
 		/**
 		 * Copyright (c) 2010 Ed Merks and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   Ed Merks - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java
index 53b22f8..1999cd5 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java
@@ -307,12 +307,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java
index 9f38375..bf773e0 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java
@@ -375,12 +375,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java
index 72d710f..5d26eeb 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java
@@ -271,12 +271,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java
index 96bae55..11f8051 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java
@@ -163,10 +163,12 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java
index 179d4ea..f35c445 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java
@@ -211,10 +211,12 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java
index 6ca9d26..a34bda8 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java
@@ -214,12 +214,14 @@
 
 		/**
 		 * Copyright (c) 2010 Ed Merks and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   Ed Merks - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java
index e5fb867..824a6b5 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java
@@ -563,12 +563,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java
index 4e002bb..662ff3d 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java
@@ -473,12 +473,14 @@
 
 		/**
 		 * Copyright (c) 2004-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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java
index 8e5965f..b6d0c6a 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java
@@ -150,10 +150,12 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java
index 01a394c..f6f736e 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java
@@ -1428,12 +1428,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/EntryPoint.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/EntryPoint.java
index e3e636e..f4193f3 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/EntryPoint.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/EntryPoint.java
@@ -168,12 +168,14 @@
 
 		/**
 		 * Copyright (c) 20010 Ed Merks and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   Ed Merks - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java
index 980f4dc..0f13c98 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java
@@ -173,10 +173,12 @@
 
 		/**
 		 * Copyright (c) 2005-2010 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java
index c56ff61..9b61157 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java
@@ -632,12 +632,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java
index c832694..d6f850b 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java
@@ -189,12 +189,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java
index ed35199..a5b6e79 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java
@@ -198,10 +198,12 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java
index fe45db2..6aff221 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java
@@ -309,10 +309,12 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java
index e0b051f..18a59e5 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java
@@ -208,12 +208,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java
index a5fe746..f5285a5 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java
@@ -148,10 +148,12 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java
index d0451ae..617a918 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java
@@ -617,12 +617,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java
index e47e7ad..275518b 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java
@@ -300,12 +300,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java
index 4d7aa04..e908e52 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java
@@ -668,12 +668,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java
index 0a19ea3..113d683 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java
@@ -667,12 +667,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java
index a5004b9..fb6d935 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java
@@ -617,12 +617,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java
index 45fa26b..73ab69c 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java
@@ -162,10 +162,12 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java
index 19d2034..2fbe316 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java
@@ -948,12 +948,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java
index 51a6824..bf30bc4 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java
@@ -944,12 +944,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java
index 340846e..e2b9498 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java
@@ -195,12 +195,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java
index eced52c..1f7a616 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java
@@ -141,10 +141,12 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java
index ea6a46d..2bc5960 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java
@@ -195,10 +195,12 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java
index 9f18e9e..e06f60a 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java
@@ -411,12 +411,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java
index b31033b..a879445 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java
@@ -175,12 +175,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java
index f0eaa0d..09b3756 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java
@@ -255,12 +255,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java
index dfeeea7..0e6e39c 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java
@@ -820,12 +820,14 @@
 
 		/**
 		 * Copyright (c) 2002-2013 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java
index 2e86aa2..407724d 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java
@@ -175,12 +175,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java
index 24e6195..fa6eb97 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java
@@ -145,10 +145,12 @@
 
 		/**
 		 * Copyright (c) 2005-2008 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java
index 4b2252b..c82d829 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java
@@ -156,10 +156,12 @@
 
 		/**
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java
index 056e831..f8cba8c 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java
@@ -166,12 +166,14 @@
 
 		/**
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java
index 7ab3fd1..0d7bda2 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java
@@ -266,12 +266,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java
index cbe4803..244a865 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java
@@ -166,12 +166,14 @@
 
 		/**
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java
index 2b69c58..26d4ca5 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java
@@ -136,10 +136,12 @@
 
 		/**
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java
index ca89ec5..7b577a8 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java
@@ -154,10 +154,12 @@
 
 		/**
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java
index d22e51c..77eadb6 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java
@@ -223,12 +223,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/plugin.properties b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/plugin.properties
index 9514905..eceb1f5 100644
--- a/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/plugin.properties
+++ b/deprecated/4.5/portfolio/org.eclipse.egf.emf.pattern/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/build.properties b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/build.properties
index c0f53db..e1caa55 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/build.properties
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java
index 867e885..6b979e6 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java
@@ -148,10 +148,12 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java
index 748e0fc..8a9d7a4 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java
@@ -149,12 +149,14 @@
 
 		/**
 		 * Copyright (c) 2010 Ed Merks and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   Ed Merks - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java
index 53b22f8..1999cd5 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java
@@ -307,12 +307,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java
index 9f38375..bf773e0 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java
@@ -375,12 +375,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java
index 72d710f..5d26eeb 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java
@@ -271,12 +271,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java
index 96bae55..11f8051 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java
@@ -163,10 +163,12 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java
index 179d4ea..f35c445 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java
@@ -211,10 +211,12 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java
index 6ca9d26..a34bda8 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java
@@ -214,12 +214,14 @@
 
 		/**
 		 * Copyright (c) 2010 Ed Merks and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   Ed Merks - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java
index e5fb867..824a6b5 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java
@@ -563,12 +563,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java
index 4e002bb..662ff3d 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java
@@ -473,12 +473,14 @@
 
 		/**
 		 * Copyright (c) 2004-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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java
index 8e5965f..b6d0c6a 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java
@@ -150,10 +150,12 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java
index 01a394c..f6f736e 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java
@@ -1428,12 +1428,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/EntryPoint.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/EntryPoint.java
index e3e636e..f4193f3 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/EntryPoint.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/EntryPoint.java
@@ -168,12 +168,14 @@
 
 		/**
 		 * Copyright (c) 20010 Ed Merks and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   Ed Merks - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java
index 980f4dc..0f13c98 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java
@@ -173,10 +173,12 @@
 
 		/**
 		 * Copyright (c) 2005-2010 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java
index c56ff61..9b61157 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java
@@ -632,12 +632,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java
index c832694..d6f850b 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java
@@ -189,12 +189,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java
index ed35199..a5b6e79 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java
@@ -198,10 +198,12 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java
index fe45db2..6aff221 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java
@@ -309,10 +309,12 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java
index e0b051f..18a59e5 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java
@@ -208,12 +208,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java
index a5fe746..f5285a5 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java
@@ -148,10 +148,12 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java
index e47e7ad..275518b 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java
@@ -300,12 +300,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java
index 4d7aa04..e908e52 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java
@@ -668,12 +668,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java
index 0a19ea3..113d683 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java
@@ -667,12 +667,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java
index 45fa26b..73ab69c 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java
@@ -162,10 +162,12 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java
index 19d2034..2fbe316 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java
@@ -948,12 +948,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java
index 51a6824..bf30bc4 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java
@@ -944,12 +944,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java
index 340846e..e2b9498 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java
@@ -195,12 +195,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java
index eced52c..1f7a616 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java
@@ -141,10 +141,12 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java
index ea6a46d..2bc5960 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java
@@ -195,10 +195,12 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java
index 9f18e9e..e06f60a 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java
@@ -411,12 +411,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java
index b31033b..a879445 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java
@@ -175,12 +175,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java
index f0eaa0d..09b3756 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java
@@ -255,12 +255,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java
index dfeeea7..0e6e39c 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java
@@ -820,12 +820,14 @@
 
 		/**
 		 * Copyright (c) 2002-2013 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java
index 2e86aa2..407724d 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java
@@ -175,12 +175,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java
index 24e6195..fa6eb97 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java
@@ -145,10 +145,12 @@
 
 		/**
 		 * Copyright (c) 2005-2008 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java
index 4b2252b..c82d829 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java
@@ -156,10 +156,12 @@
 
 		/**
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java
index 056e831..f8cba8c 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java
@@ -166,12 +166,14 @@
 
 		/**
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java
index 7ab3fd1..0d7bda2 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java
@@ -266,12 +266,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java
index cbe4803..244a865 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java
@@ -166,12 +166,14 @@
 
 		/**
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java
index 2b69c58..26d4ca5 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java
@@ -136,10 +136,12 @@
 
 		/**
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java
index ca89ec5..7b577a8 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java
@@ -154,10 +154,12 @@
 
 		/**
 		 * Copyright (c) 2005 IBM Corporation and others.
-		 * All rights reserved.   This program and the accompanying materials
-		 * are made available under the terms of the Eclipse Public License v1.0
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java
index d22e51c..77eadb6 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java
@@ -223,12 +223,14 @@
 
 		/**
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
 		 *
-		 * Contributors:
+		 * SPDX-License-Identifier: EPL-2.0
+		 * 
+		 * Contributors: 
 		 *   IBM - Initial API and implementation
 		 */
 
diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/plugin.properties b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/plugin.properties
index 3747c7c..c8b055e 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/plugin.properties
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/plugin.xml b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/plugin.xml
index 9468fb4..2fced3b 100644
--- a/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/plugin.xml
+++ b/deprecated/4.6/portfolio/org.eclipse.egf.emf.pattern/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/portfolio/EcoreTools/plugins/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java b/deprecated/portfolio/EcoreTools/plugins/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java
index 7190091..0dbfa54 100644
--- a/deprecated/portfolio/EcoreTools/plugins/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java
+++ b/deprecated/portfolio/EcoreTools/plugins/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2011 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/build.properties b/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/build.properties
index fe9e4cb..81010ee 100644
--- a/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/build.properties
+++ b/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/fragment.properties b/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/fragment.properties
index 6aeb2c3..a6b9671 100644
--- a/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/fragment.properties
+++ b/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/fragment.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/handler/TargetPlatformGenerateHandler.java b/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/handler/TargetPlatformGenerateHandler.java
index 6d17340..c7d075b 100644
--- a/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/handler/TargetPlatformGenerateHandler.java
+++ b/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/handler/TargetPlatformGenerateHandler.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * 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
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * IBM - Initial API and implementation
diff --git a/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/presentation/TargetPlatformAdapterFactoryEditingDomain.java b/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/presentation/TargetPlatformAdapterFactoryEditingDomain.java
index 4bca028..20ab66a 100644
--- a/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/presentation/TargetPlatformAdapterFactoryEditingDomain.java
+++ b/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/presentation/TargetPlatformAdapterFactoryEditingDomain.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/presentation/TargetPlatformGenModelActionBarContributor.java b/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/presentation/TargetPlatformGenModelActionBarContributor.java
index 2d1b881..b17eeab 100644
--- a/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/presentation/TargetPlatformGenModelActionBarContributor.java
+++ b/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/presentation/TargetPlatformGenModelActionBarContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * 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
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * IBM - Initial API and implementation
diff --git a/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/presentation/TargetPlatformGenModelEditor.java b/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/presentation/TargetPlatformGenModelEditor.java
index e52d5f0..1c3dac8 100644
--- a/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/presentation/TargetPlatformGenModelEditor.java
+++ b/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/presentation/TargetPlatformGenModelEditor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * 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
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * IBM - Initial API and implementation
diff --git a/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/presentation/TargetPlatformGeneratorUIUtil.java b/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/presentation/TargetPlatformGeneratorUIUtil.java
index f31d029..649b996 100644
--- a/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/presentation/TargetPlatformGeneratorUIUtil.java
+++ b/deprecated/tp/org.eclipse.egf.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/presentation/TargetPlatformGeneratorUIUtil.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * 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
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * IBM - Initial API and implementation
diff --git a/deprecated/tp/org.eclipse.egf.emf.ecore.editor/build.properties b/deprecated/tp/org.eclipse.egf.emf.ecore.editor/build.properties
index fe9e4cb..81010ee 100644
--- a/deprecated/tp/org.eclipse.egf.emf.ecore.editor/build.properties
+++ b/deprecated/tp/org.eclipse.egf.emf.ecore.editor/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/tp/org.eclipse.egf.emf.ecore.editor/fragment.properties b/deprecated/tp/org.eclipse.egf.emf.ecore.editor/fragment.properties
index 50d6aad..b725dc0 100644
--- a/deprecated/tp/org.eclipse.egf.emf.ecore.editor/fragment.properties
+++ b/deprecated/tp/org.eclipse.egf.emf.ecore.editor/fragment.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/tp/org.eclipse.egf.emf.ecore.editor/src/org/eclipse/emf/ecore/presentation/TargetPlatformAdapterFactoryEditingDomain.java b/deprecated/tp/org.eclipse.egf.emf.ecore.editor/src/org/eclipse/emf/ecore/presentation/TargetPlatformAdapterFactoryEditingDomain.java
index 641076b..e512eea 100644
--- a/deprecated/tp/org.eclipse.egf.emf.ecore.editor/src/org/eclipse/emf/ecore/presentation/TargetPlatformAdapterFactoryEditingDomain.java
+++ b/deprecated/tp/org.eclipse.egf.emf.ecore.editor/src/org/eclipse/emf/ecore/presentation/TargetPlatformAdapterFactoryEditingDomain.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/tp/org.eclipse.egf.emf.ecore.editor/src/org/eclipse/emf/ecore/presentation/TargetPlatformEcoreActionBarContributor.java b/deprecated/tp/org.eclipse.egf.emf.ecore.editor/src/org/eclipse/emf/ecore/presentation/TargetPlatformEcoreActionBarContributor.java
index 5530049..d583ac9 100644
--- a/deprecated/tp/org.eclipse.egf.emf.ecore.editor/src/org/eclipse/emf/ecore/presentation/TargetPlatformEcoreActionBarContributor.java
+++ b/deprecated/tp/org.eclipse.egf.emf.ecore.editor/src/org/eclipse/emf/ecore/presentation/TargetPlatformEcoreActionBarContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * 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
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * IBM - Initial API and implementation
diff --git a/deprecated/tp/org.eclipse.egf.emf.ecore.editor/src/org/eclipse/emf/ecore/presentation/TargetPlatformEcoreEditor.java b/deprecated/tp/org.eclipse.egf.emf.ecore.editor/src/org/eclipse/emf/ecore/presentation/TargetPlatformEcoreEditor.java
index f0976b8..7c86cf7 100644
--- a/deprecated/tp/org.eclipse.egf.emf.ecore.editor/src/org/eclipse/emf/ecore/presentation/TargetPlatformEcoreEditor.java
+++ b/deprecated/tp/org.eclipse.egf.emf.ecore.editor/src/org/eclipse/emf/ecore/presentation/TargetPlatformEcoreEditor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * 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
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * IBM - Initial API and implementation
diff --git a/deprecated/tp/org.eclipse.egf.emf.ecore.editor/src/org/eclipse/emf/ecore/presentation/TargetPlatformEcoreModelWizard.java b/deprecated/tp/org.eclipse.egf.emf.ecore.editor/src/org/eclipse/emf/ecore/presentation/TargetPlatformEcoreModelWizard.java
index c707c25..006e9a6 100644
--- a/deprecated/tp/org.eclipse.egf.emf.ecore.editor/src/org/eclipse/emf/ecore/presentation/TargetPlatformEcoreModelWizard.java
+++ b/deprecated/tp/org.eclipse.egf.emf.ecore.editor/src/org/eclipse/emf/ecore/presentation/TargetPlatformEcoreModelWizard.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

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

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM - Initial API and implementation

diff --git a/deprecated/tp/org.eclipse.egf.emf.importer/build.properties b/deprecated/tp/org.eclipse.egf.emf.importer/build.properties
index fe9e4cb..81010ee 100644
--- a/deprecated/tp/org.eclipse.egf.emf.importer/build.properties
+++ b/deprecated/tp/org.eclipse.egf.emf.importer/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/tp/org.eclipse.egf.emf.importer/fragment.properties b/deprecated/tp/org.eclipse.egf.emf.importer/fragment.properties
index f9faf4a..d7efd14 100644
--- a/deprecated/tp/org.eclipse.egf.emf.importer/fragment.properties
+++ b/deprecated/tp/org.eclipse.egf.emf.importer/fragment.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/tp/org.eclipse.egf.emf.importer/src/org/eclipse/egf/emf/importer/l10n/TargetPlatformEMFImporterMessages.java b/deprecated/tp/org.eclipse.egf.emf.importer/src/org/eclipse/egf/emf/importer/l10n/TargetPlatformEMFImporterMessages.java
index 4087451..1f0f6ce 100644
--- a/deprecated/tp/org.eclipse.egf.emf.importer/src/org/eclipse/egf/emf/importer/l10n/TargetPlatformEMFImporterMessages.java
+++ b/deprecated/tp/org.eclipse.egf.emf.importer/src/org/eclipse/egf/emf/importer/l10n/TargetPlatformEMFImporterMessages.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/tp/org.eclipse.egf.emf.importer/src/org/eclipse/egf/emf/importer/l10n/messages.properties b/deprecated/tp/org.eclipse.egf.emf.importer/src/org/eclipse/egf/emf/importer/l10n/messages.properties
index d24671c..16f2044 100644
--- a/deprecated/tp/org.eclipse.egf.emf.importer/src/org/eclipse/egf/emf/importer/l10n/messages.properties
+++ b/deprecated/tp/org.eclipse.egf.emf.importer/src/org/eclipse/egf/emf/importer/l10n/messages.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/tp/org.eclipse.egf.emf.importer/src/org/eclipse/emf/importer/ui/TargetPlatformEMFModelWizard.java b/deprecated/tp/org.eclipse.egf.emf.importer/src/org/eclipse/emf/importer/ui/TargetPlatformEMFModelWizard.java
index 053d843..cf353ca 100644
--- a/deprecated/tp/org.eclipse.egf.emf.importer/src/org/eclipse/emf/importer/ui/TargetPlatformEMFModelWizard.java
+++ b/deprecated/tp/org.eclipse.egf.emf.importer/src/org/eclipse/emf/importer/ui/TargetPlatformEMFModelWizard.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/deprecated/tp/org.eclipse.egf.emf.importer/src/org/eclipse/emf/importer/ui/TargetPlatformGenModelReloadActionDelegate.java b/deprecated/tp/org.eclipse.egf.emf.importer/src/org/eclipse/emf/importer/ui/TargetPlatformGenModelReloadActionDelegate.java
index 179bdee..7465832 100644
--- a/deprecated/tp/org.eclipse.egf.emf.importer/src/org/eclipse/emf/importer/ui/TargetPlatformGenModelReloadActionDelegate.java
+++ b/deprecated/tp/org.eclipse.egf.emf.importer/src/org/eclipse/emf/importer/ui/TargetPlatformGenModelReloadActionDelegate.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/doc/org.eclipse.egf.doc.user/build.properties b/doc/org.eclipse.egf.doc.user/build.properties
index e2808b0..b46c4b8 100644
--- a/doc/org.eclipse.egf.doc.user/build.properties
+++ b/doc/org.eclipse.egf.doc.user/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0l

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/doc/org.eclipse.egf.doc.user/plugin.properties b/doc/org.eclipse.egf.doc.user/plugin.properties
index df478c6..6cd4dec 100644
--- a/doc/org.eclipse.egf.doc.user/plugin.properties
+++ b/doc/org.eclipse.egf.doc.user/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/doc/org.eclipse.egf.doc.user/plugin.xml b/doc/org.eclipse.egf.doc.user/plugin.xml
index 75a1fab..8a19c58 100644
--- a/doc/org.eclipse.egf.doc.user/plugin.xml
+++ b/doc/org.eclipse.egf.doc.user/plugin.xml
Binary files differ
diff --git a/doc/org.eclipse.egf.engine.doc.pattern/build.properties b/doc/org.eclipse.egf.engine.doc.pattern/build.properties
index 4b237e9..a43d916 100644
--- a/doc/org.eclipse.egf.engine.doc.pattern/build.properties
+++ b/doc/org.eclipse.egf.engine.doc.pattern/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/doc/org.eclipse.egf.engine.doc.pattern/plugin.properties b/doc/org.eclipse.egf.engine.doc.pattern/plugin.properties
index 3a3c3a9..0088a61 100644
--- a/doc/org.eclipse.egf.engine.doc.pattern/plugin.properties
+++ b/doc/org.eclipse.egf.engine.doc.pattern/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/doc/org.eclipse.egf.engine.doc.pattern/plugin.xml b/doc/org.eclipse.egf.engine.doc.pattern/plugin.xml
index 435ea62..6b39dfd 100644
--- a/doc/org.eclipse.egf.engine.doc.pattern/plugin.xml
+++ b/doc/org.eclipse.egf.engine.doc.pattern/plugin.xml
Binary files differ
diff --git a/doc/org.eclipse.egf.engine.doc/build.properties b/doc/org.eclipse.egf.engine.doc/build.properties
index 579d11f..1b5fcc7 100644
--- a/doc/org.eclipse.egf.engine.doc/build.properties
+++ b/doc/org.eclipse.egf.engine.doc/build.properties
@@ -1,10 +1,13 @@
 

 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/doc/org.eclipse.egf.engine.doc/plugin.properties b/doc/org.eclipse.egf.engine.doc/plugin.properties
index b9784e7..4d645c7 100644
--- a/doc/org.eclipse.egf.engine.doc/plugin.properties
+++ b/doc/org.eclipse.egf.engine.doc/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/doc/org.eclipse.egf.engine.doc/plugin.xml b/doc/org.eclipse.egf.engine.doc/plugin.xml
index f07986e..cc4c4f9 100644
--- a/doc/org.eclipse.egf.engine.doc/plugin.xml
+++ b/doc/org.eclipse.egf.engine.doc/plugin.xml
Binary files differ
diff --git a/doc/pom.xml b/doc/pom.xml
index cd1ad58..c2fa857 100644
--- a/doc/pom.xml
+++ b/doc/pom.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2018 THALES GLOBAL SERVICES.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
   which accompanies this distribution, and is available at
-  http://www.eclipse.org/legal/epl-v10.html
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 
   Contributors:
        Thales - initial API and implementation
diff --git a/examples/workspace/org.eclipse.egf.example.emf.docgen.html/build.properties b/examples/workspace/org.eclipse.egf.example.emf.docgen.html/build.properties
index 9106f29..8c0e719 100644
--- a/examples/workspace/org.eclipse.egf.example.emf.docgen.html/build.properties
+++ b/examples/workspace/org.eclipse.egf.example.emf.docgen.html/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.example.emf.docgen.html/plugin.properties b/examples/workspace/org.eclipse.egf.example.emf.docgen.html/plugin.properties
index 4e11fdb..7dd4cde 100644
--- a/examples/workspace/org.eclipse.egf.example.emf.docgen.html/plugin.properties
+++ b/examples/workspace/org.eclipse.egf.example.emf.docgen.html/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.example.emf.docgen.html/plugin.xml b/examples/workspace/org.eclipse.egf.example.emf.docgen.html/plugin.xml
index 359faec..3d8ef1d 100644
--- a/examples/workspace/org.eclipse.egf.example.emf.docgen.html/plugin.xml
+++ b/examples/workspace/org.eclipse.egf.example.emf.docgen.html/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.example.fcs/build.properties b/examples/workspace/org.eclipse.egf.example.fcs/build.properties
index c78490f..938826a 100644
--- a/examples/workspace/org.eclipse.egf.example.fcs/build.properties
+++ b/examples/workspace/org.eclipse.egf.example.fcs/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.example.fcs/plugin.properties b/examples/workspace/org.eclipse.egf.example.fcs/plugin.properties
index 0d3a798..02995f6 100644
--- a/examples/workspace/org.eclipse.egf.example.fcs/plugin.properties
+++ b/examples/workspace/org.eclipse.egf.example.fcs/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.example.strategy.modeldriven/build.properties b/examples/workspace/org.eclipse.egf.example.strategy.modeldriven/build.properties
index 192e4b1..3ba6ca0 100644
--- a/examples/workspace/org.eclipse.egf.example.strategy.modeldriven/build.properties
+++ b/examples/workspace/org.eclipse.egf.example.strategy.modeldriven/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/examples/workspace/org.eclipse.egf.example.strategy.modeldriven/plugin.properties b/examples/workspace/org.eclipse.egf.example.strategy.modeldriven/plugin.properties
index 70f129f..5509cdc 100644
--- a/examples/workspace/org.eclipse.egf.example.strategy.modeldriven/plugin.properties
+++ b/examples/workspace/org.eclipse.egf.example.strategy.modeldriven/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.example.task.ant/plugin.properties b/examples/workspace/org.eclipse.egf.example.task.ant/plugin.properties
index ffece97..47c71fd 100644
--- a/examples/workspace/org.eclipse.egf.example.task.ant/plugin.properties
+++ b/examples/workspace/org.eclipse.egf.example.task.ant/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/examples/workspace/org.eclipse.egf.example.task.ant/src/org/eclipse/egf/example/task/ant/Activator.java b/examples/workspace/org.eclipse.egf.example.task.ant/src/org/eclipse/egf/example/task/ant/Activator.java
index aaaccda..0e288f4 100644
--- a/examples/workspace/org.eclipse.egf.example.task.ant/src/org/eclipse/egf/example/task/ant/Activator.java
+++ b/examples/workspace/org.eclipse.egf.example.task.ant/src/org/eclipse/egf/example/task/ant/Activator.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.example.task.ant/src/org/eclipse/egf/example/task/ant/tasks/WriteAndReadContractInTask.java b/examples/workspace/org.eclipse.egf.example.task.ant/src/org/eclipse/egf/example/task/ant/tasks/WriteAndReadContractInTask.java
index 922eb09..0d14146 100644
--- a/examples/workspace/org.eclipse.egf.example.task.ant/src/org/eclipse/egf/example/task/ant/tasks/WriteAndReadContractInTask.java
+++ b/examples/workspace/org.eclipse.egf.example.task.ant/src/org/eclipse/egf/example/task/ant/tasks/WriteAndReadContractInTask.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.example.task.h1/build.properties b/examples/workspace/org.eclipse.egf.example.task.h1/build.properties
index 4d6a126..2e51c5f 100644
--- a/examples/workspace/org.eclipse.egf.example.task.h1/build.properties
+++ b/examples/workspace/org.eclipse.egf.example.task.h1/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.example.task.h1/plugin.properties b/examples/workspace/org.eclipse.egf.example.task.h1/plugin.properties
index f0c02ef..998af5d 100644
--- a/examples/workspace/org.eclipse.egf.example.task.h1/plugin.properties
+++ b/examples/workspace/org.eclipse.egf.example.task.h1/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.example.task.h4/build.properties b/examples/workspace/org.eclipse.egf.example.task.h4/build.properties
index 4d6a126..2e51c5f 100644
--- a/examples/workspace/org.eclipse.egf.example.task.h4/build.properties
+++ b/examples/workspace/org.eclipse.egf.example.task.h4/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.example.task.h4/plugin.properties b/examples/workspace/org.eclipse.egf.example.task.h4/plugin.properties
index 076dc20..02218db 100644
--- a/examples/workspace/org.eclipse.egf.example.task.h4/plugin.properties
+++ b/examples/workspace/org.eclipse.egf.example.task.h4/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.example.task.h4/src/org/eclipse/egf/example/task/h4/Activator.java b/examples/workspace/org.eclipse.egf.example.task.h4/src/org/eclipse/egf/example/task/h4/Activator.java
index 3b7096c..52d3401 100644
--- a/examples/workspace/org.eclipse.egf.example.task.h4/src/org/eclipse/egf/example/task/h4/Activator.java
+++ b/examples/workspace/org.eclipse.egf.example.task.h4/src/org/eclipse/egf/example/task/h4/Activator.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2015 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.example.task.h4/src/org/eclipse/egf/example/task/h4/H4.java b/examples/workspace/org.eclipse.egf.example.task.h4/src/org/eclipse/egf/example/task/h4/H4.java
index 5e4d40d..9114aea 100644
--- a/examples/workspace/org.eclipse.egf.example.task.h4/src/org/eclipse/egf/example/task/h4/H4.java
+++ b/examples/workspace/org.eclipse.egf.example.task.h4/src/org/eclipse/egf/example/task/h4/H4.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2015 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.examples.installer/plugin.properties b/examples/workspace/org.eclipse.egf.examples.installer/plugin.properties
index ab3d729..551d625 100644
--- a/examples/workspace/org.eclipse.egf.examples.installer/plugin.properties
+++ b/examples/workspace/org.eclipse.egf.examples.installer/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/examples/workspace/org.eclipse.egf.examples.installer/pom.xml b/examples/workspace/org.eclipse.egf.examples.installer/pom.xml
index f8e078a..43bb2cd 100644
--- a/examples/workspace/org.eclipse.egf.examples.installer/pom.xml
+++ b/examples/workspace/org.eclipse.egf.examples.installer/pom.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.examples.installer/src/org/eclipse/egf/examples/installer/EGFExamplesInstallerWizard.java b/examples/workspace/org.eclipse.egf.examples.installer/src/org/eclipse/egf/examples/installer/EGFExamplesInstallerWizard.java
index b335b20..838fcd2 100644
--- a/examples/workspace/org.eclipse.egf.examples.installer/src/org/eclipse/egf/examples/installer/EGFExamplesInstallerWizard.java
+++ b/examples/workspace/org.eclipse.egf.examples.installer/src/org/eclipse/egf/examples/installer/EGFExamplesInstallerWizard.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.portfolio.acceleo3.examples.installer/plugin.properties b/examples/workspace/org.eclipse.egf.portfolio.acceleo3.examples.installer/plugin.properties
index d58e8b8..92d065f 100644
--- a/examples/workspace/org.eclipse.egf.portfolio.acceleo3.examples.installer/plugin.properties
+++ b/examples/workspace/org.eclipse.egf.portfolio.acceleo3.examples.installer/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/examples/workspace/org.eclipse.egf.portfolio.acceleo3.examples.installer/src/org/eclipse/egf/portfolio/acceleo3/examples/installer/EGFExamplesInstallerWizard.java b/examples/workspace/org.eclipse.egf.portfolio.acceleo3.examples.installer/src/org/eclipse/egf/portfolio/acceleo3/examples/installer/EGFExamplesInstallerWizard.java
index 7299817..11b77b1 100644
--- a/examples/workspace/org.eclipse.egf.portfolio.acceleo3.examples.installer/src/org/eclipse/egf/portfolio/acceleo3/examples/installer/EGFExamplesInstallerWizard.java
+++ b/examples/workspace/org.eclipse.egf.portfolio.acceleo3.examples.installer/src/org/eclipse/egf/portfolio/acceleo3/examples/installer/EGFExamplesInstallerWizard.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.portfolio.atl.examples.installer/plugin.properties b/examples/workspace/org.eclipse.egf.portfolio.atl.examples.installer/plugin.properties
index 1c53dd8..881e7ca 100644
--- a/examples/workspace/org.eclipse.egf.portfolio.atl.examples.installer/plugin.properties
+++ b/examples/workspace/org.eclipse.egf.portfolio.atl.examples.installer/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/examples/workspace/org.eclipse.egf.portfolio.atl.examples.installer/src/org/eclipse/egf/portfolio/atl/examples/installer/EGFExamplesInstallerWizard.java b/examples/workspace/org.eclipse.egf.portfolio.atl.examples.installer/src/org/eclipse/egf/portfolio/atl/examples/installer/EGFExamplesInstallerWizard.java
index 59e3d77..80e0b05 100644
--- a/examples/workspace/org.eclipse.egf.portfolio.atl.examples.installer/src/org/eclipse/egf/portfolio/atl/examples/installer/EGFExamplesInstallerWizard.java
+++ b/examples/workspace/org.eclipse.egf.portfolio.atl.examples.installer/src/org/eclipse/egf/portfolio/atl/examples/installer/EGFExamplesInstallerWizard.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.portfolio.eclipse.build.examples/build.properties b/examples/workspace/org.eclipse.egf.portfolio.eclipse.build.examples/build.properties
index e1dc5bc..8278820 100644
--- a/examples/workspace/org.eclipse.egf.portfolio.eclipse.build.examples/build.properties
+++ b/examples/workspace/org.eclipse.egf.portfolio.eclipse.build.examples/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009, 2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.portfolio.eclipse.build.examples/plugin.properties b/examples/workspace/org.eclipse.egf.portfolio.eclipse.build.examples/plugin.properties
index 8856a0a..fc51bab 100644
--- a/examples/workspace/org.eclipse.egf.portfolio.eclipse.build.examples/plugin.properties
+++ b/examples/workspace/org.eclipse.egf.portfolio.eclipse.build.examples/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.portfolio.genchain.extension/build.properties b/examples/workspace/org.eclipse.egf.portfolio.genchain.extension/build.properties
index befc904..720aa84 100644
--- a/examples/workspace/org.eclipse.egf.portfolio.genchain.extension/build.properties
+++ b/examples/workspace/org.eclipse.egf.portfolio.genchain.extension/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/examples/workspace/org.eclipse.egf.portfolio.genchain.extension/plugin.properties b/examples/workspace/org.eclipse.egf.portfolio.genchain.extension/plugin.properties
index ca9302a..39553e7 100644
--- a/examples/workspace/org.eclipse.egf.portfolio.genchain.extension/plugin.properties
+++ b/examples/workspace/org.eclipse.egf.portfolio.genchain.extension/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/examples/workspace/org.eclipse.egf.portfolio.genchain.extension/src/org/eclipse/egf/portfolio/genchain/extension/Activator.java b/examples/workspace/org.eclipse.egf.portfolio.genchain.extension/src/org/eclipse/egf/portfolio/genchain/extension/Activator.java
index e170bef..70798b0 100644
--- a/examples/workspace/org.eclipse.egf.portfolio.genchain.extension/src/org/eclipse/egf/portfolio/genchain/extension/Activator.java
+++ b/examples/workspace/org.eclipse.egf.portfolio.genchain.extension/src/org/eclipse/egf/portfolio/genchain/extension/Activator.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/examples/workspace/org.eclipse.egf.portfolio.genchain.extension/src/org/eclipse/egf/portfolio/genchain/extension/MySampleExtension.java b/examples/workspace/org.eclipse.egf.portfolio.genchain.extension/src/org/eclipse/egf/portfolio/genchain/extension/MySampleExtension.java
index 0590bbd..056944e 100644
--- a/examples/workspace/org.eclipse.egf.portfolio.genchain.extension/src/org/eclipse/egf/portfolio/genchain/extension/MySampleExtension.java
+++ b/examples/workspace/org.eclipse.egf.portfolio.genchain.extension/src/org/eclipse/egf/portfolio/genchain/extension/MySampleExtension.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/examples/workspace/org.eclipse.egf.portfolio.genchain.extension/src/org/eclipse/egf/portfolio/genchain/extension/MySampleTask.java b/examples/workspace/org.eclipse.egf.portfolio.genchain.extension/src/org/eclipse/egf/portfolio/genchain/extension/MySampleTask.java
index ad7a586..c4e9a1c 100644
--- a/examples/workspace/org.eclipse.egf.portfolio.genchain.extension/src/org/eclipse/egf/portfolio/genchain/extension/MySampleTask.java
+++ b/examples/workspace/org.eclipse.egf.portfolio.genchain.extension/src/org/eclipse/egf/portfolio/genchain/extension/MySampleTask.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/examples/workspace/org.eclipse.egf.usecase.acceleo3/build.properties b/examples/workspace/org.eclipse.egf.usecase.acceleo3/build.properties
index ccaf082..d91a3e3 100644
--- a/examples/workspace/org.eclipse.egf.usecase.acceleo3/build.properties
+++ b/examples/workspace/org.eclipse.egf.usecase.acceleo3/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2011 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.acceleo3/plugin.properties b/examples/workspace/org.eclipse.egf.usecase.acceleo3/plugin.properties
index 1c1c505..66405f5 100644
--- a/examples/workspace/org.eclipse.egf.usecase.acceleo3/plugin.properties
+++ b/examples/workspace/org.eclipse.egf.usecase.acceleo3/plugin.properties
@@ -2,10 +2,13 @@
 # <copyright>

 ##

 #  Copyright (c) 2009-2011 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.acceleo3/plugin.xml b/examples/workspace/org.eclipse.egf.usecase.acceleo3/plugin.xml
index 47f5c58..158cbe3 100644
--- a/examples/workspace/org.eclipse.egf.usecase.acceleo3/plugin.xml
+++ b/examples/workspace/org.eclipse.egf.usecase.acceleo3/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2009-2011 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.acceleo3/src/org/eclipse/egf/usecase/acceleo3/Activator.java b/examples/workspace/org.eclipse.egf.usecase.acceleo3/src/org/eclipse/egf/usecase/acceleo3/Activator.java
index d425965..ebf1ad8 100644
--- a/examples/workspace/org.eclipse.egf.usecase.acceleo3/src/org/eclipse/egf/usecase/acceleo3/Activator.java
+++ b/examples/workspace/org.eclipse.egf.usecase.acceleo3/src/org/eclipse/egf/usecase/acceleo3/Activator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2010 Obeo.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  *     Obeo - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.acceleo3/src/org/eclipse/egf/usecase/acceleo3/files/Generate.java b/examples/workspace/org.eclipse.egf.usecase.acceleo3/src/org/eclipse/egf/usecase/acceleo3/files/Generate.java
index d1c7efe..a6be0f0 100644
--- a/examples/workspace/org.eclipse.egf.usecase.acceleo3/src/org/eclipse/egf/usecase/acceleo3/files/Generate.java
+++ b/examples/workspace/org.eclipse.egf.usecase.acceleo3/src/org/eclipse/egf/usecase/acceleo3/files/Generate.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2010 Obeo.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  *     Obeo - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.activityworkflow.uc1/build.properties b/examples/workspace/org.eclipse.egf.usecase.activityworkflow.uc1/build.properties
index e6109f3..8c8e510 100644
--- a/examples/workspace/org.eclipse.egf.usecase.activityworkflow.uc1/build.properties
+++ b/examples/workspace/org.eclipse.egf.usecase.activityworkflow.uc1/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.activityworkflow.uc1/plugin.properties b/examples/workspace/org.eclipse.egf.usecase.activityworkflow.uc1/plugin.properties
index 60df0ca..9f5942d 100644
--- a/examples/workspace/org.eclipse.egf.usecase.activityworkflow.uc1/plugin.properties
+++ b/examples/workspace/org.eclipse.egf.usecase.activityworkflow.uc1/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.activityworkflow.uc1/plugin.xml b/examples/workspace/org.eclipse.egf.usecase.activityworkflow.uc1/plugin.xml
index 4a9068e..fd87894 100644
--- a/examples/workspace/org.eclipse.egf.usecase.activityworkflow.uc1/plugin.xml
+++ b/examples/workspace/org.eclipse.egf.usecase.activityworkflow.uc1/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.activityworkflow.uc1/src/org/eclipse/egf/usecase/activityworkflow/uc1/java/HelloJava.java b/examples/workspace/org.eclipse.egf.usecase.activityworkflow.uc1/src/org/eclipse/egf/usecase/activityworkflow/uc1/java/HelloJava.java
index b72a33e..6ea8446 100644
--- a/examples/workspace/org.eclipse.egf.usecase.activityworkflow.uc1/src/org/eclipse/egf/usecase/activityworkflow/uc1/java/HelloJava.java
+++ b/examples/workspace/org.eclipse.egf.usecase.activityworkflow.uc1/src/org/eclipse/egf/usecase/activityworkflow/uc1/java/HelloJava.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.atl/build.properties b/examples/workspace/org.eclipse.egf.usecase.atl/build.properties
index cd321f8..6e246d7 100644
--- a/examples/workspace/org.eclipse.egf.usecase.atl/build.properties
+++ b/examples/workspace/org.eclipse.egf.usecase.atl/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2011 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.atl/plugin.xml b/examples/workspace/org.eclipse.egf.usecase.atl/plugin.xml
index 4717e38..5f3d28b 100644
--- a/examples/workspace/org.eclipse.egf.usecase.atl/plugin.xml
+++ b/examples/workspace/org.eclipse.egf.usecase.atl/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2009-2011 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.emf.uc1/plugin.properties b/examples/workspace/org.eclipse.egf.usecase.emf.uc1/plugin.properties
index 5c919c2..cd83f9e 100644
--- a/examples/workspace/org.eclipse.egf.usecase.emf.uc1/plugin.properties
+++ b/examples/workspace/org.eclipse.egf.usecase.emf.uc1/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.emf.uc2/build.properties b/examples/workspace/org.eclipse.egf.usecase.emf.uc2/build.properties
index 5e5a006..99ae3d6 100644
--- a/examples/workspace/org.eclipse.egf.usecase.emf.uc2/build.properties
+++ b/examples/workspace/org.eclipse.egf.usecase.emf.uc2/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.emf.uc2/generated/org/eclipse/egf/usecase/emf/library/editor/pluginproperties/EditorPluginPropertiesExtensionRedefinitionSolution.java b/examples/workspace/org.eclipse.egf.usecase.emf.uc2/generated/org/eclipse/egf/usecase/emf/library/editor/pluginproperties/EditorPluginPropertiesExtensionRedefinitionSolution.java
index 9930ccd..e710797 100644
--- a/examples/workspace/org.eclipse.egf.usecase.emf.uc2/generated/org/eclipse/egf/usecase/emf/library/editor/pluginproperties/EditorPluginPropertiesExtensionRedefinitionSolution.java
+++ b/examples/workspace/org.eclipse.egf.usecase.emf.uc2/generated/org/eclipse/egf/usecase/emf/library/editor/pluginproperties/EditorPluginPropertiesExtensionRedefinitionSolution.java
@@ -128,10 +128,12 @@
 		 * <copyright>
 		 *
 		 * 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
+		 * This program and the accompanying materials
+		 * are made available under the terms of the Eclipse Public License v2.0
 		 * which accompanies this distribution, and is available at
-		 * http://www.eclipse.org/legal/epl-v10.html
+		 * https://www.eclipse.org/legal/epl-v2.0
+		 *
+		 * SPDX-License-Identifier: EPL-2.0
 		 * 
 		 * Contributors: 
 		 *   IBM - Initial API and implementation
diff --git a/examples/workspace/org.eclipse.egf.usecase.emf.uc2/plugin.properties b/examples/workspace/org.eclipse.egf.usecase.emf.uc2/plugin.properties
index e79b5bd..9f276d5 100644
--- a/examples/workspace/org.eclipse.egf.usecase.emf.uc2/plugin.properties
+++ b/examples/workspace/org.eclipse.egf.usecase.emf.uc2/plugin.properties
@@ -2,10 +2,13 @@
 # <copyright>

 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.emf.uc2/plugin.xml b/examples/workspace/org.eclipse.egf.usecase.emf.uc2/plugin.xml
index ab7c502..db3959c 100644
--- a/examples/workspace/org.eclipse.egf.usecase.emf.uc2/plugin.xml
+++ b/examples/workspace/org.eclipse.egf.usecase.emf.uc2/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.emf.uc3/build.properties b/examples/workspace/org.eclipse.egf.usecase.emf.uc3/build.properties
index e06b5ab..1cd60c4 100644
--- a/examples/workspace/org.eclipse.egf.usecase.emf.uc3/build.properties
+++ b/examples/workspace/org.eclipse.egf.usecase.emf.uc3/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.emf.uc3/plugin.properties b/examples/workspace/org.eclipse.egf.usecase.emf.uc3/plugin.properties
index e976218..ba05951 100644
--- a/examples/workspace/org.eclipse.egf.usecase.emf.uc3/plugin.properties
+++ b/examples/workspace/org.eclipse.egf.usecase.emf.uc3/plugin.properties
@@ -2,10 +2,13 @@
 # <copyright>

 ##

 #  Copyright (c) 2009, 2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.emf.uc3/plugin.xml b/examples/workspace/org.eclipse.egf.usecase.emf.uc3/plugin.xml
index 1688343..40a390a 100644
--- a/examples/workspace/org.eclipse.egf.usecase.emf.uc3/plugin.xml
+++ b/examples/workspace/org.eclipse.egf.usecase.emf.uc3/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.emf.uc3/src/org/eclipse/egf/usecase/emf/uc3/CreateEmfInfoFileTask.java b/examples/workspace/org.eclipse.egf.usecase.emf.uc3/src/org/eclipse/egf/usecase/emf/uc3/CreateEmfInfoFileTask.java
index 0c2f719..6a8d3e0 100644
--- a/examples/workspace/org.eclipse.egf.usecase.emf.uc3/src/org/eclipse/egf/usecase/emf/uc3/CreateEmfInfoFileTask.java
+++ b/examples/workspace/org.eclipse.egf.usecase.emf.uc3/src/org/eclipse/egf/usecase/emf/uc3/CreateEmfInfoFileTask.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.fc.uc1/build.properties b/examples/workspace/org.eclipse.egf.usecase.fc.uc1/build.properties
index 5edf618..160fb4a 100644
--- a/examples/workspace/org.eclipse.egf.usecase.fc.uc1/build.properties
+++ b/examples/workspace/org.eclipse.egf.usecase.fc.uc1/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.fc.uc1/plugin.properties b/examples/workspace/org.eclipse.egf.usecase.fc.uc1/plugin.properties
index 06876a2..999349d 100644
--- a/examples/workspace/org.eclipse.egf.usecase.fc.uc1/plugin.properties
+++ b/examples/workspace/org.eclipse.egf.usecase.fc.uc1/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.fc.uc1/plugin.xml b/examples/workspace/org.eclipse.egf.usecase.fc.uc1/plugin.xml
index 9f18e40..e23e192 100644
--- a/examples/workspace/org.eclipse.egf.usecase.fc.uc1/plugin.xml
+++ b/examples/workspace/org.eclipse.egf.usecase.fc.uc1/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.fc.uc1/src/org/eclipse/egf/usecase/fc/uc1/HelloWorld.java b/examples/workspace/org.eclipse.egf.usecase.fc.uc1/src/org/eclipse/egf/usecase/fc/uc1/HelloWorld.java
index fc9d160..e7a9d79 100644
--- a/examples/workspace/org.eclipse.egf.usecase.fc.uc1/src/org/eclipse/egf/usecase/fc/uc1/HelloWorld.java
+++ b/examples/workspace/org.eclipse.egf.usecase.fc.uc1/src/org/eclipse/egf/usecase/fc/uc1/HelloWorld.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.fc.uc1/src/org/eclipse/egf/usecase/fc/uc1/PricerComputation.java b/examples/workspace/org.eclipse.egf.usecase.fc.uc1/src/org/eclipse/egf/usecase/fc/uc1/PricerComputation.java
index 1bb09ee..4db6f4a 100644
--- a/examples/workspace/org.eclipse.egf.usecase.fc.uc1/src/org/eclipse/egf/usecase/fc/uc1/PricerComputation.java
+++ b/examples/workspace/org.eclipse.egf.usecase.fc.uc1/src/org/eclipse/egf/usecase/fc/uc1/PricerComputation.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.fc.uc1/src/org/eclipse/egf/usecase/fc/uc1/PricerDisplay.java b/examples/workspace/org.eclipse.egf.usecase.fc.uc1/src/org/eclipse/egf/usecase/fc/uc1/PricerDisplay.java
index 5b6e5c1..61f9748 100644
--- a/examples/workspace/org.eclipse.egf.usecase.fc.uc1/src/org/eclipse/egf/usecase/fc/uc1/PricerDisplay.java
+++ b/examples/workspace/org.eclipse.egf.usecase.fc.uc1/src/org/eclipse/egf/usecase/fc/uc1/PricerDisplay.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.generationchain.uc1/build.properties b/examples/workspace/org.eclipse.egf.usecase.generationchain.uc1/build.properties
index c57ed45..09cc257 100644
--- a/examples/workspace/org.eclipse.egf.usecase.generationchain.uc1/build.properties
+++ b/examples/workspace/org.eclipse.egf.usecase.generationchain.uc1/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.generationchain.uc1/plugin.properties b/examples/workspace/org.eclipse.egf.usecase.generationchain.uc1/plugin.properties
index 332cf36..f3d396d 100644
--- a/examples/workspace/org.eclipse.egf.usecase.generationchain.uc1/plugin.properties
+++ b/examples/workspace/org.eclipse.egf.usecase.generationchain.uc1/plugin.properties
@@ -2,10 +2,13 @@
 # <copyright>

 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.jet/plugin.properties b/examples/workspace/org.eclipse.egf.usecase.jet/plugin.properties
index f70743b..53b4e40 100644
--- a/examples/workspace/org.eclipse.egf.usecase.jet/plugin.properties
+++ b/examples/workspace/org.eclipse.egf.usecase.jet/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2011 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.jet/src/org/eclipse/egf/usecase/jet/Activator.java b/examples/workspace/org.eclipse.egf.usecase.jet/src/org/eclipse/egf/usecase/jet/Activator.java
index d8c7f21..0fe9397 100644
--- a/examples/workspace/org.eclipse.egf.usecase.jet/src/org/eclipse/egf/usecase/jet/Activator.java
+++ b/examples/workspace/org.eclipse.egf.usecase.jet/src/org/eclipse/egf/usecase/jet/Activator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2010 Obeo.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  *     Obeo - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.jet/src/org/eclipse/egf/usecase/jet/task/GenerateClassTaskProduction.java b/examples/workspace/org.eclipse.egf.usecase.jet/src/org/eclipse/egf/usecase/jet/task/GenerateClassTaskProduction.java
index a1b9162..5a01866 100644
--- a/examples/workspace/org.eclipse.egf.usecase.jet/src/org/eclipse/egf/usecase/jet/task/GenerateClassTaskProduction.java
+++ b/examples/workspace/org.eclipse.egf.usecase.jet/src/org/eclipse/egf/usecase/jet/task/GenerateClassTaskProduction.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2011 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/build.properties b/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/build.properties
index 748dd10..c459943 100644
--- a/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/build.properties
+++ b/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/build.properties
@@ -1,10 +1,13 @@
 

 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/plugin.properties b/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/plugin.properties
index 1ef092f..0c072a8 100644
--- a/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/plugin.properties
+++ b/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/HelloWorld.java b/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/HelloWorld.java
index 8b52925..52f49a2 100644
--- a/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/HelloWorld.java
+++ b/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/HelloWorld.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/callback/MyCallbackHandler.java b/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/callback/MyCallbackHandler.java
index 9361014..fd7c816 100644
--- a/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/callback/MyCallbackHandler.java
+++ b/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/callback/MyCallbackHandler.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/helper/MyHelper.java b/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/helper/MyHelper.java
index 71476b2..1b8dcd7 100644
--- a/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/helper/MyHelper.java
+++ b/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/helper/MyHelper.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/query/ContentQuery.java b/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/query/ContentQuery.java
index 4c3cf4d..95cefa30 100644
--- a/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/query/ContentQuery.java
+++ b/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/query/ContentQuery.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/reporter/MyReporter.java b/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/reporter/MyReporter.java
index 43b80d2..e6b9028 100644
--- a/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/reporter/MyReporter.java
+++ b/examples/workspace/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/reporter/MyReporter.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/examples/workspace/org.eclipse.egf.usecase.pattern.uc2/build.properties b/examples/workspace/org.eclipse.egf.usecase.pattern.uc2/build.properties
index 8d0d822..4568e23 100644
--- a/examples/workspace/org.eclipse.egf.usecase.pattern.uc2/build.properties
+++ b/examples/workspace/org.eclipse.egf.usecase.pattern.uc2/build.properties
@@ -1,10 +1,13 @@
 

 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.pattern.uc2/plugin.properties b/examples/workspace/org.eclipse.egf.usecase.pattern.uc2/plugin.properties
index 002c8a5..53dd0e6 100644
--- a/examples/workspace/org.eclipse.egf.usecase.pattern.uc2/plugin.properties
+++ b/examples/workspace/org.eclipse.egf.usecase.pattern.uc2/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.pattern.uc2/plugin.xml b/examples/workspace/org.eclipse.egf.usecase.pattern.uc2/plugin.xml
index dd77f5b..363e1d7 100644
--- a/examples/workspace/org.eclipse.egf.usecase.pattern.uc2/plugin.xml
+++ b/examples/workspace/org.eclipse.egf.usecase.pattern.uc2/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.0"?>

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.pattern.uc3.m2treporting/plugin.properties b/examples/workspace/org.eclipse.egf.usecase.pattern.uc3.m2treporting/plugin.properties
index 8fd3d38..a2a8bed 100644
--- a/examples/workspace/org.eclipse.egf.usecase.pattern.uc3.m2treporting/plugin.properties
+++ b/examples/workspace/org.eclipse.egf.usecase.pattern.uc3.m2treporting/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/examples/workspace/org.eclipse.egf.usecase.pattern.uc3.m2treporting/src/org/eclipse/egf/usecase/pattern/uc3/m2treporting/reporter/AdditionalParametersReporter.java b/examples/workspace/org.eclipse.egf.usecase.pattern.uc3.m2treporting/src/org/eclipse/egf/usecase/pattern/uc3/m2treporting/reporter/AdditionalParametersReporter.java
index 7dae2e3..2d6aab3 100644
--- a/examples/workspace/org.eclipse.egf.usecase.pattern.uc3.m2treporting/src/org/eclipse/egf/usecase/pattern/uc3/m2treporting/reporter/AdditionalParametersReporter.java
+++ b/examples/workspace/org.eclipse.egf.usecase.pattern.uc3.m2treporting/src/org/eclipse/egf/usecase/pattern/uc3/m2treporting/reporter/AdditionalParametersReporter.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/examples/workspace/org.eclipse.egf.usecase.pattern.uc3.m2treporting/src/org/eclipse/egf/usecase/pattern/uc3/m2treporting/reporter/OutputInOneFileReporter.java b/examples/workspace/org.eclipse.egf.usecase.pattern.uc3.m2treporting/src/org/eclipse/egf/usecase/pattern/uc3/m2treporting/reporter/OutputInOneFileReporter.java
index c1ba6da..d345278 100644
--- a/examples/workspace/org.eclipse.egf.usecase.pattern.uc3.m2treporting/src/org/eclipse/egf/usecase/pattern/uc3/m2treporting/reporter/OutputInOneFileReporter.java
+++ b/examples/workspace/org.eclipse.egf.usecase.pattern.uc3.m2treporting/src/org/eclipse/egf/usecase/pattern/uc3/m2treporting/reporter/OutputInOneFileReporter.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/examples/workspace/org.eclipse.egf.usecase.pattern.uc3.m2treporting/src/org/eclipse/egf/usecase/pattern/uc3/m2treporting/reporter/OutputInSeveralFilesReporter.java b/examples/workspace/org.eclipse.egf.usecase.pattern.uc3.m2treporting/src/org/eclipse/egf/usecase/pattern/uc3/m2treporting/reporter/OutputInSeveralFilesReporter.java
index 6746ad6..395ea89 100644
--- a/examples/workspace/org.eclipse.egf.usecase.pattern.uc3.m2treporting/src/org/eclipse/egf/usecase/pattern/uc3/m2treporting/reporter/OutputInSeveralFilesReporter.java
+++ b/examples/workspace/org.eclipse.egf.usecase.pattern.uc3.m2treporting/src/org/eclipse/egf/usecase/pattern/uc3/m2treporting/reporter/OutputInSeveralFilesReporter.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/examples/workspace/org.eclipse.egf.usecase.pattern.uc3.m2treporting/src/org/eclipse/egf/usecase/pattern/uc3/postprocessing/MyPatternProcessor.java b/examples/workspace/org.eclipse.egf.usecase.pattern.uc3.m2treporting/src/org/eclipse/egf/usecase/pattern/uc3/postprocessing/MyPatternProcessor.java
index 9ce9488..9ae2463 100644
--- a/examples/workspace/org.eclipse.egf.usecase.pattern.uc3.m2treporting/src/org/eclipse/egf/usecase/pattern/uc3/postprocessing/MyPatternProcessor.java
+++ b/examples/workspace/org.eclipse.egf.usecase.pattern.uc3.m2treporting/src/org/eclipse/egf/usecase/pattern/uc3/postprocessing/MyPatternProcessor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2011 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/examples/workspace/pom.xml b/examples/workspace/pom.xml
index ed3465b..0c437d8 100644
--- a/examples/workspace/pom.xml
+++ b/examples/workspace/pom.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2018 THALES GLOBAL SERVICES.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
   which accompanies this distribution, and is available at
-  http://www.eclipse.org/legal/epl-v10.html
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 
   Contributors:
        Thales - initial API and implementation
diff --git a/features/org.eclipse.egf.application.feature/build.properties b/features/org.eclipse.egf.application.feature/build.properties
index 7981fd0..d2c43ea 100644
--- a/features/org.eclipse.egf.application.feature/build.properties
+++ b/features/org.eclipse.egf.application.feature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,10 +14,10 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-               epl-v10.html,\

+               epl-2.0.html,\

                license.html,\

                eclipse_update_120.jpg,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

diff --git a/features/org.eclipse.egf.application.feature/epl-2.0.html b/features/org.eclipse.egf.application.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.application.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.egf.application.feature/epl-v10.html b/features/org.eclipse.egf.application.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.application.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.application.feature/feature.properties b/features/org.eclipse.egf.application.feature/feature.properties
index 04ac394..04b4216 100644
--- a/features/org.eclipse.egf.application.feature/feature.properties
+++ b/features/org.eclipse.egf.application.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,16 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2018 THALES GLOBAL SERVICES\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +45,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.application.feature/feature.xml b/features/org.eclipse.egf.application.feature/feature.xml
index 29ffefe..c6d0609 100644
--- a/features/org.eclipse.egf.application.feature/feature.xml
+++ b/features/org.eclipse.egf.application.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -22,11 +24,7 @@
    </description>

 

    <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+      %copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.application.feature/license.html b/features/org.eclipse.egf.application.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.application.feature/license.html
+++ b/features/org.eclipse.egf.application.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.application.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.application.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.application.feature/rootfiles/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.egf.application.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.application.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.application.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.application.feature/rootfiles/license.html b/features/org.eclipse.egf.application.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.application.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.application.feature/rootfiles/notice.html b/features/org.eclipse.egf.application.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.application.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.egf.application.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.application.feature/sourceTemplateFeature/build.properties
index 5da69eb..00b2642 100644
--- a/features/org.eclipse.egf.application.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.application.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,6 +14,6 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-	           epl-v10.html,\

+	           epl-2.0.html,\

 	           license.html,\

                eclipse_update_120.jpg

diff --git a/features/org.eclipse.egf.application.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.application.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.application.feature/sourceTemplateFeature/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.egf.application.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.application.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.application.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.application.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.application.feature/sourceTemplateFeature/feature.properties
index 9e349b8..9af0673 100644
--- a/features/org.eclipse.egf.application.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.application.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2018 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,17 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2018 Eclipse contributors and others.\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +46,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.application.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.application.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.application.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.application.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.common.feature/build.properties b/features/org.eclipse.egf.common.feature/build.properties
index 4f260f3..0c17711 100644
--- a/features/org.eclipse.egf.common.feature/build.properties
+++ b/features/org.eclipse.egf.common.feature/build.properties
@@ -1,20 +1,23 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

 ##

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-               epl-v10.html,\

+               epl-2.0.html,\

                license.html,\

                eclipse_update_120.jpg,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

 generate.feature@org.eclipse.egf.common.source=org.eclipse.egf.common

diff --git a/features/org.eclipse.egf.common.feature/epl-2.0.html b/features/org.eclipse.egf.common.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.common.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.egf.common.feature/epl-v10.html b/features/org.eclipse.egf.common.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.common.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.common.feature/feature.properties b/features/org.eclipse.egf.common.feature/feature.properties
index 5cf7eb7..9fbf501 100644
--- a/features/org.eclipse.egf.common.feature/feature.properties
+++ b/features/org.eclipse.egf.common.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,17 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2018 Eclipse contributors and others.\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +46,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.common.feature/feature.xml b/features/org.eclipse.egf.common.feature/feature.xml
index 67fc75f..f3a050d 100644
--- a/features/org.eclipse.egf.common.feature/feature.xml
+++ b/features/org.eclipse.egf.common.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -22,11 +24,7 @@
    </description>

 

    <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.common.feature/license.html b/features/org.eclipse.egf.common.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.common.feature/license.html
+++ b/features/org.eclipse.egf.common.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.common.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.common.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.common.feature/rootfiles/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.egf.common.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.common.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.common.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.common.feature/rootfiles/license.html b/features/org.eclipse.egf.common.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.common.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.common.feature/rootfiles/notice.html b/features/org.eclipse.egf.common.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.common.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.egf.common.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.egf.common.feature/sourceTemplateBundle/plugin.properties
index ce94e0d..25ffb54 100644
--- a/features/org.eclipse.egf.common.feature/sourceTemplateBundle/plugin.properties
+++ b/features/org.eclipse.egf.common.feature/sourceTemplateBundle/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.common.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.common.feature/sourceTemplateFeature/build.properties
index d212e61..e25f674 100644
--- a/features/org.eclipse.egf.common.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.common.feature/sourceTemplateFeature/build.properties
@@ -1,16 +1,19 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
 ##
 
 bin.includes =\
-epl-v10.html,\
+epl-2.0.html,\
 feature.*,\
 eclipse_update_120.jpg,\
 license.html
diff --git a/features/org.eclipse.egf.common.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.common.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.common.feature/sourceTemplateFeature/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.egf.common.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.common.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2761abd..0000000
--- a/features/org.eclipse.egf.common.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<meta name="ProgId" content="Word.Document">

-<meta name="Generator" content="Microsoft Word 9">

-<meta name="Originator" content="Microsoft Word 9">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.gmf/features/org.eclipse.gmf.sdk-feature/sourceTemplateFeature/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{font-family:Tahoma;

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-generic-font-family:swiss;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	font-family:Tahoma;

-	mso-fareast-font-family:"Times New Roman";}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.common.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.common.feature/sourceTemplateFeature/feature.properties
index a714a32..be89f11 100644
--- a/features/org.eclipse.egf.common.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.common.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,16 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2018 THALES GLOBAL SERVICES\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -31,69 +44,144 @@
 # "license" property - text of the "Feature Update License"
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
-Eclipse.org Software User Agreement\n\
-\n\
 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 OTHER MATERIALS FOR OPEN SOURCE PROJECTS\n\
-(COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND\n\
-CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE\n\
-OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND\n\
-CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 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 Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0\n\
-("EPL").  A copy of the EPL is 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, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS\n\
-modules ("Modules") and made available as downloadable archives ("Downloads").\n\
-\n\   
-* Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), 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) in a directory named "plugins".\n\
-* 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 "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins\n\
-  and/or Fragments associated with that Feature.\n\
-* Features may also include other Features ("Included Features"). Within a Feature, \n\
-files named "feature.xml" may contain a list of the names and version numbers of Included Features.\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\
-The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and \n\
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\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 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 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\
-Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the\n\
-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\n\
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.\n\
-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\n\
-that directory.\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\
-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\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 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\
-* 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\
-* IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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 TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please\n\
-contact the Eclipse Foundation to determine what terms and conditions 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\
+Use of Provisioning Technology\n\
+\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\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\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 currently 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, 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 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 Sun Microsystems, Inc. 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.egf.common.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.common.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.common.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.common.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.common.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.egf.common.feature/sourceTemplatePlugin/about.properties
index 22289c6..adc1b57 100644
--- a/features/org.eclipse.egf.common.feature/sourceTemplatePlugin/about.properties
+++ b/features/org.eclipse.egf.common.feature/sourceTemplatePlugin/about.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.common.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.egf.common.feature/sourceTemplatePlugin/build.properties
index 0e50697..da78593 100644
--- a/features/org.eclipse.egf.common.feature/sourceTemplatePlugin/build.properties
+++ b/features/org.eclipse.egf.common.feature/sourceTemplatePlugin/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.common.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.egf.common.feature/sourceTemplatePlugin/plugin.properties
index ce94e0d..25ffb54 100644
--- a/features/org.eclipse.egf.common.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.egf.common.feature/sourceTemplatePlugin/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.common.ui.feature/build.properties b/features/org.eclipse.egf.common.ui.feature/build.properties
index c13d77b..78fb281 100644
--- a/features/org.eclipse.egf.common.ui.feature/build.properties
+++ b/features/org.eclipse.egf.common.ui.feature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,11 +14,11 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-               epl-v10.html,\

+               epl-2.0.html,\

                license.html,\

                eclipse_update_120.jpg,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

 generate.feature@org.eclipse.egf.common.ui.source=org.eclipse.egf.common.ui

diff --git a/features/org.eclipse.egf.common.ui.feature/epl-2.0.html b/features/org.eclipse.egf.common.ui.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.common.ui.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.egf.common.ui.feature/epl-v10.html b/features/org.eclipse.egf.common.ui.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.common.ui.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.common.ui.feature/feature.properties b/features/org.eclipse.egf.common.ui.feature/feature.properties
index 4dc9a2a..dede49d 100644
--- a/features/org.eclipse.egf.common.ui.feature/feature.properties
+++ b/features/org.eclipse.egf.common.ui.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,17 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2018 Eclipse contributors and others.\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +46,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.common.ui.feature/feature.xml b/features/org.eclipse.egf.common.ui.feature/feature.xml
index 06eb88a..9f71213 100644
--- a/features/org.eclipse.egf.common.ui.feature/feature.xml
+++ b/features/org.eclipse.egf.common.ui.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -23,11 +25,7 @@
     </description>

 

     <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

     </copyright>

 

     <license  url="%licenseURL">

diff --git a/features/org.eclipse.egf.common.ui.feature/license.html b/features/org.eclipse.egf.common.ui.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.common.ui.feature/license.html
+++ b/features/org.eclipse.egf.common.ui.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.common.ui.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.common.ui.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.common.ui.feature/rootfiles/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.egf.common.ui.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.common.ui.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.common.ui.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.common.ui.feature/rootfiles/license.html b/features/org.eclipse.egf.common.ui.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.common.ui.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.common.ui.feature/rootfiles/notice.html b/features/org.eclipse.egf.common.ui.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.common.ui.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.egf.common.ui.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.egf.common.ui.feature/sourceTemplateBundle/plugin.properties
index d027782..2692f9e 100644
--- a/features/org.eclipse.egf.common.ui.feature/sourceTemplateBundle/plugin.properties
+++ b/features/org.eclipse.egf.common.ui.feature/sourceTemplateBundle/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.common.ui.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.common.ui.feature/sourceTemplateFeature/build.properties
index ec40e29..d774351 100644
--- a/features/org.eclipse.egf.common.ui.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.common.ui.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -11,7 +14,7 @@
 
 # NLS_MESSAGEFORMAT_VAR
 bin.includes =\
-epl-v10.html,\
+epl-2.0.html,\
 feature.*,\
 eclipse_update_120.jpg,\
 license.html
diff --git a/features/org.eclipse.egf.common.ui.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.common.ui.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.common.ui.feature/sourceTemplateFeature/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.egf.common.ui.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.common.ui.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2761abd..0000000
--- a/features/org.eclipse.egf.common.ui.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<meta name="ProgId" content="Word.Document">

-<meta name="Generator" content="Microsoft Word 9">

-<meta name="Originator" content="Microsoft Word 9">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.gmf/features/org.eclipse.gmf.sdk-feature/sourceTemplateFeature/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{font-family:Tahoma;

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-generic-font-family:swiss;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	font-family:Tahoma;

-	mso-fareast-font-family:"Times New Roman";}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.common.ui.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.common.ui.feature/sourceTemplateFeature/feature.properties
index e42d15a..ebcd71d 100644
--- a/features/org.eclipse.egf.common.ui.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.common.ui.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,16 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2018 THALES GLOBAL SERVICES\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +45,143 @@
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-February 1, 2011\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\
-       - 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\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\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.egf.common.ui.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.common.ui.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.common.ui.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.common.ui.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.common.ui.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.egf.common.ui.feature/sourceTemplatePlugin/about.properties
index 6d130d9..9c2e233 100644
--- a/features/org.eclipse.egf.common.ui.feature/sourceTemplatePlugin/about.properties
+++ b/features/org.eclipse.egf.common.ui.feature/sourceTemplatePlugin/about.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.common.ui.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.egf.common.ui.feature/sourceTemplatePlugin/build.properties
index 0e50697..da78593 100644
--- a/features/org.eclipse.egf.common.ui.feature/sourceTemplatePlugin/build.properties
+++ b/features/org.eclipse.egf.common.ui.feature/sourceTemplatePlugin/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.common.ui.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.egf.common.ui.feature/sourceTemplatePlugin/plugin.properties
index d027782..2692f9e 100644
--- a/features/org.eclipse.egf.common.ui.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.egf.common.ui.feature/sourceTemplatePlugin/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.core.feature/build.properties b/features/org.eclipse.egf.core.feature/build.properties
index e18128f..3217ce1 100644
--- a/features/org.eclipse.egf.core.feature/build.properties
+++ b/features/org.eclipse.egf.core.feature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,11 +14,11 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-               epl-v10.html,\

+               epl-2.0.html,\

                license.html,\

                eclipse_update_120.jpg,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

 generate.feature@org.eclipse.egf.core.source=org.eclipse.egf.core

diff --git a/features/org.eclipse.egf.core.feature/epl-2.0.html b/features/org.eclipse.egf.core.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.core.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.egf.core.feature/epl-v10.html b/features/org.eclipse.egf.core.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.core.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.core.feature/feature.properties b/features/org.eclipse.egf.core.feature/feature.properties
index 59503b9..6b2b69b 100644
--- a/features/org.eclipse.egf.core.feature/feature.properties
+++ b/features/org.eclipse.egf.core.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,16 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2018 THALES GLOBAL SERVICES\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +45,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.core.feature/feature.xml b/features/org.eclipse.egf.core.feature/feature.xml
index 27795cd..6620c22 100644
--- a/features/org.eclipse.egf.core.feature/feature.xml
+++ b/features/org.eclipse.egf.core.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -22,11 +24,7 @@
    </description>

 

    <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.core.feature/license.html b/features/org.eclipse.egf.core.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.core.feature/license.html
+++ b/features/org.eclipse.egf.core.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.core.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.core.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.core.feature/rootfiles/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.egf.core.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.core.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.core.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.core.feature/rootfiles/license.html b/features/org.eclipse.egf.core.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.core.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.core.feature/rootfiles/notice.html b/features/org.eclipse.egf.core.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.core.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.egf.core.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.egf.core.feature/sourceTemplateBundle/plugin.properties
index f024220..ba8ad49 100644
--- a/features/org.eclipse.egf.core.feature/sourceTemplateBundle/plugin.properties
+++ b/features/org.eclipse.egf.core.feature/sourceTemplateBundle/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.core.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.core.feature/sourceTemplateFeature/build.properties
index ec40e29..d774351 100644
--- a/features/org.eclipse.egf.core.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.core.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -11,7 +14,7 @@
 
 # NLS_MESSAGEFORMAT_VAR
 bin.includes =\
-epl-v10.html,\
+epl-2.0.html,\
 feature.*,\
 eclipse_update_120.jpg,\
 license.html
diff --git a/features/org.eclipse.egf.core.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.core.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.core.feature/sourceTemplateFeature/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.egf.core.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.core.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2761abd..0000000
--- a/features/org.eclipse.egf.core.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<meta name="ProgId" content="Word.Document">

-<meta name="Generator" content="Microsoft Word 9">

-<meta name="Originator" content="Microsoft Word 9">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.gmf/features/org.eclipse.gmf.sdk-feature/sourceTemplateFeature/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{font-family:Tahoma;

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-generic-font-family:swiss;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	font-family:Tahoma;

-	mso-fareast-font-family:"Times New Roman";}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.core.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.core.feature/sourceTemplateFeature/feature.properties
index 80645b5..f3a59ae 100644
--- a/features/org.eclipse.egf.core.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.core.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,17 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2018 Eclipse contributors and others.\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +46,143 @@
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-February 1, 2011\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\
-       - 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\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\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.egf.core.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.core.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.core.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.core.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.core.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.egf.core.feature/sourceTemplatePlugin/about.properties
index b424c0f..835f50c 100644
--- a/features/org.eclipse.egf.core.feature/sourceTemplatePlugin/about.properties
+++ b/features/org.eclipse.egf.core.feature/sourceTemplatePlugin/about.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.core.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.egf.core.feature/sourceTemplatePlugin/build.properties
index 0e50697..da78593 100644
--- a/features/org.eclipse.egf.core.feature/sourceTemplatePlugin/build.properties
+++ b/features/org.eclipse.egf.core.feature/sourceTemplatePlugin/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.core.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.egf.core.feature/sourceTemplatePlugin/plugin.properties
index f024220..ba8ad49 100644
--- a/features/org.eclipse.egf.core.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.egf.core.feature/sourceTemplatePlugin/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.core.ui.feature/build.properties b/features/org.eclipse.egf.core.ui.feature/build.properties
index 0fcc1a9..e57cda1 100644
--- a/features/org.eclipse.egf.core.ui.feature/build.properties
+++ b/features/org.eclipse.egf.core.ui.feature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,11 +14,11 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-               epl-v10.html,\

+               epl-2.0.html,\

                license.html,\

                eclipse_update_120.jpg,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

 generate.feature@org.eclipse.egf.core.ui.source=org.eclipse.egf.core.ui

diff --git a/features/org.eclipse.egf.core.ui.feature/epl-2.0.html b/features/org.eclipse.egf.core.ui.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.core.ui.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.egf.core.ui.feature/epl-v10.html b/features/org.eclipse.egf.core.ui.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.core.ui.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.core.ui.feature/feature.properties b/features/org.eclipse.egf.core.ui.feature/feature.properties
index 60be9b1..90022f9 100644
--- a/features/org.eclipse.egf.core.ui.feature/feature.properties
+++ b/features/org.eclipse.egf.core.ui.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,17 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2018 Eclipse contributors and others.\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +46,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.core.ui.feature/feature.xml b/features/org.eclipse.egf.core.ui.feature/feature.xml
index 5820819..49325d6 100644
--- a/features/org.eclipse.egf.core.ui.feature/feature.xml
+++ b/features/org.eclipse.egf.core.ui.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -22,11 +24,7 @@
    </description>

 

    <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.core.ui.feature/license.html b/features/org.eclipse.egf.core.ui.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.core.ui.feature/license.html
+++ b/features/org.eclipse.egf.core.ui.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.core.ui.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.core.ui.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.core.ui.feature/rootfiles/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.egf.core.ui.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.core.ui.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.core.ui.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.core.ui.feature/rootfiles/license.html b/features/org.eclipse.egf.core.ui.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.core.ui.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.core.ui.feature/rootfiles/notice.html b/features/org.eclipse.egf.core.ui.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.core.ui.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.egf.core.ui.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.egf.core.ui.feature/sourceTemplateBundle/plugin.properties
index 4e6d026..b47c257 100644
--- a/features/org.eclipse.egf.core.ui.feature/sourceTemplateBundle/plugin.properties
+++ b/features/org.eclipse.egf.core.ui.feature/sourceTemplateBundle/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.core.ui.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.core.ui.feature/sourceTemplateFeature/build.properties
index ec40e29..d774351 100644
--- a/features/org.eclipse.egf.core.ui.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.core.ui.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -11,7 +14,7 @@
 
 # NLS_MESSAGEFORMAT_VAR
 bin.includes =\
-epl-v10.html,\
+epl-2.0.html,\
 feature.*,\
 eclipse_update_120.jpg,\
 license.html
diff --git a/features/org.eclipse.egf.core.ui.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.core.ui.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.core.ui.feature/sourceTemplateFeature/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.egf.core.ui.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.core.ui.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2761abd..0000000
--- a/features/org.eclipse.egf.core.ui.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<meta name="ProgId" content="Word.Document">

-<meta name="Generator" content="Microsoft Word 9">

-<meta name="Originator" content="Microsoft Word 9">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.gmf/features/org.eclipse.gmf.sdk-feature/sourceTemplateFeature/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{font-family:Tahoma;

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-generic-font-family:swiss;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	font-family:Tahoma;

-	mso-fareast-font-family:"Times New Roman";}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.core.ui.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.core.ui.feature/sourceTemplateFeature/feature.properties
index 1f3db57..d952ab2 100644
--- a/features/org.eclipse.egf.core.ui.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.core.ui.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -32,125 +35,143 @@
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-February 1, 2011\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\
-       - 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\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\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.egf.core.ui.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.core.ui.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.core.ui.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.core.ui.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.core.ui.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.egf.core.ui.feature/sourceTemplatePlugin/about.properties
index a958eeb..88e3933 100644
--- a/features/org.eclipse.egf.core.ui.feature/sourceTemplatePlugin/about.properties
+++ b/features/org.eclipse.egf.core.ui.feature/sourceTemplatePlugin/about.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.core.ui.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.egf.core.ui.feature/sourceTemplatePlugin/build.properties
index 0e50697..da78593 100644
--- a/features/org.eclipse.egf.core.ui.feature/sourceTemplatePlugin/build.properties
+++ b/features/org.eclipse.egf.core.ui.feature/sourceTemplatePlugin/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.core.ui.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.egf.core.ui.feature/sourceTemplatePlugin/plugin.properties
index 4e6d026..b47c257 100644
--- a/features/org.eclipse.egf.core.ui.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.egf.core.ui.feature/sourceTemplatePlugin/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.doc.feature/build.properties b/features/org.eclipse.egf.doc.feature/build.properties
index 7981fd0..d2c43ea 100644
--- a/features/org.eclipse.egf.doc.feature/build.properties
+++ b/features/org.eclipse.egf.doc.feature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,10 +14,10 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-               epl-v10.html,\

+               epl-2.0.html,\

                license.html,\

                eclipse_update_120.jpg,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

diff --git a/features/org.eclipse.egf.doc.feature/epl-2.0.html b/features/org.eclipse.egf.doc.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.doc.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.egf.doc.feature/epl-v10.html b/features/org.eclipse.egf.doc.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.doc.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.doc.feature/feature.properties b/features/org.eclipse.egf.doc.feature/feature.properties
index b00702f..81a902a 100644
--- a/features/org.eclipse.egf.doc.feature/feature.properties
+++ b/features/org.eclipse.egf.doc.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,17 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2018 Eclipse contributors and others.\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +46,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.doc.feature/feature.xml b/features/org.eclipse.egf.doc.feature/feature.xml
index c534293..83ea4cd 100644
--- a/features/org.eclipse.egf.doc.feature/feature.xml
+++ b/features/org.eclipse.egf.doc.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -22,11 +24,7 @@
    </description>

 

    <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.doc.feature/license.html b/features/org.eclipse.egf.doc.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.doc.feature/license.html
+++ b/features/org.eclipse.egf.doc.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.doc.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.doc.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.doc.feature/rootfiles/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.egf.doc.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.doc.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.doc.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.doc.feature/rootfiles/license.html b/features/org.eclipse.egf.doc.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.doc.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.doc.feature/rootfiles/notice.html b/features/org.eclipse.egf.doc.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.doc.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.egf.doc.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.doc.feature/sourceTemplateFeature/build.properties
index 5da69eb..00b2642 100644
--- a/features/org.eclipse.egf.doc.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.doc.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,6 +14,6 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-	           epl-v10.html,\

+	           epl-2.0.html,\

 	           license.html,\

                eclipse_update_120.jpg

diff --git a/features/org.eclipse.egf.doc.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.doc.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.doc.feature/sourceTemplateFeature/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.egf.doc.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.doc.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.doc.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.doc.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.doc.feature/sourceTemplateFeature/feature.properties
index bbf9daa..e793d58 100644
--- a/features/org.eclipse.egf.doc.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.doc.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2018 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,17 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2018 Eclipse contributors and others.\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +46,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.doc.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.doc.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.doc.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.doc.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.examples.feature/build.properties b/features/org.eclipse.egf.examples.feature/build.properties
index 13a41c2..8412082 100644
--- a/features/org.eclipse.egf.examples.feature/build.properties
+++ b/features/org.eclipse.egf.examples.feature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,11 +14,11 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-               epl-v10.html,\

+               epl-2.0.html,\

                license.html,\

                eclipse_update_120.jpg,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

 generate.feature@org.eclipse.egf.examples.source=org.eclipse.egf.examples

diff --git a/features/org.eclipse.egf.examples.feature/epl-2.0.html b/features/org.eclipse.egf.examples.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.examples.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.egf.examples.feature/epl-v10.html b/features/org.eclipse.egf.examples.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.examples.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.examples.feature/feature.properties b/features/org.eclipse.egf.examples.feature/feature.properties
index f5d85e4..24f7f51 100644
--- a/features/org.eclipse.egf.examples.feature/feature.properties
+++ b/features/org.eclipse.egf.examples.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,16 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2018 THALES GLOBAL SERVICES\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +45,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.examples.feature/feature.xml b/features/org.eclipse.egf.examples.feature/feature.xml
index 18580df..dea0152 100644
--- a/features/org.eclipse.egf.examples.feature/feature.xml
+++ b/features/org.eclipse.egf.examples.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -21,11 +23,7 @@
    </description>

 

    <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES

-All rights reserved. This program and the accompanying materials

-are made available under the terms of the Eclipse Public License v1.0

-which accompanies this distribution, and is available at

-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.examples.feature/license.html b/features/org.eclipse.egf.examples.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.examples.feature/license.html
+++ b/features/org.eclipse.egf.examples.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.examples.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.examples.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.examples.feature/rootfiles/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.egf.examples.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.examples.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.examples.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.examples.feature/rootfiles/license.html b/features/org.eclipse.egf.examples.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.examples.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.examples.feature/rootfiles/notice.html b/features/org.eclipse.egf.examples.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.examples.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.egf.examples.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.egf.examples.feature/sourceTemplateBundle/plugin.properties
index 648dc03..2bfa21b 100644
--- a/features/org.eclipse.egf.examples.feature/sourceTemplateBundle/plugin.properties
+++ b/features/org.eclipse.egf.examples.feature/sourceTemplateBundle/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.examples.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.examples.feature/sourceTemplateFeature/build.properties
index d212e61..e25f674 100644
--- a/features/org.eclipse.egf.examples.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.examples.feature/sourceTemplateFeature/build.properties
@@ -1,16 +1,19 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
 ##
 
 bin.includes =\
-epl-v10.html,\
+epl-2.0.html,\
 feature.*,\
 eclipse_update_120.jpg,\
 license.html
diff --git a/features/org.eclipse.egf.examples.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.examples.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.examples.feature/sourceTemplateFeature/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.egf.examples.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.examples.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2761abd..0000000
--- a/features/org.eclipse.egf.examples.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<meta name="ProgId" content="Word.Document">

-<meta name="Generator" content="Microsoft Word 9">

-<meta name="Originator" content="Microsoft Word 9">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.gmf/features/org.eclipse.gmf.sdk-feature/sourceTemplateFeature/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{font-family:Tahoma;

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-generic-font-family:swiss;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	font-family:Tahoma;

-	mso-fareast-font-family:"Times New Roman";}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.examples.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.examples.feature/sourceTemplateFeature/feature.properties
index 7f22cf6..7b2c2e9 100644
--- a/features/org.eclipse.egf.examples.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.examples.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,16 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2018 THALES GLOBAL SERVICES\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +45,143 @@
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-February 1, 2011\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\
-       - 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\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\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.egf.examples.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.examples.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.examples.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.examples.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.examples.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.egf.examples.feature/sourceTemplatePlugin/about.properties
index bc4271d..a239284 100644
--- a/features/org.eclipse.egf.examples.feature/sourceTemplatePlugin/about.properties
+++ b/features/org.eclipse.egf.examples.feature/sourceTemplatePlugin/about.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.examples.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.egf.examples.feature/sourceTemplatePlugin/build.properties
index 0e50697..da78593 100644
--- a/features/org.eclipse.egf.examples.feature/sourceTemplatePlugin/build.properties
+++ b/features/org.eclipse.egf.examples.feature/sourceTemplatePlugin/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.examples.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.egf.examples.feature/sourceTemplatePlugin/plugin.properties
index 648dc03..2bfa21b 100644
--- a/features/org.eclipse.egf.examples.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.egf.examples.feature/sourceTemplatePlugin/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.feature/build.properties b/features/org.eclipse.egf.feature/build.properties
index 7981fd0..d2c43ea 100644
--- a/features/org.eclipse.egf.feature/build.properties
+++ b/features/org.eclipse.egf.feature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,10 +14,10 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-               epl-v10.html,\

+               epl-2.0.html,\

                license.html,\

                eclipse_update_120.jpg,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

diff --git a/features/org.eclipse.egf.feature/epl-2.0.html b/features/org.eclipse.egf.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.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.egf.feature/epl-v10.html b/features/org.eclipse.egf.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.feature/feature.properties b/features/org.eclipse.egf.feature/feature.properties
index 653ab87..2c4338e 100644
--- a/features/org.eclipse.egf.feature/feature.properties
+++ b/features/org.eclipse.egf.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,17 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2018 Eclipse contributors and others.\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +46,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.feature/feature.xml b/features/org.eclipse.egf.feature/feature.xml
index bf5f271..b7f76c9 100644
--- a/features/org.eclipse.egf.feature/feature.xml
+++ b/features/org.eclipse.egf.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -22,11 +24,7 @@
    </description>

 

    <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.feature/license.html b/features/org.eclipse.egf.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.feature/license.html
+++ b/features/org.eclipse.egf.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.feature/rootfiles/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.egf.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.feature/rootfiles/license.html b/features/org.eclipse.egf.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.feature/rootfiles/notice.html b/features/org.eclipse.egf.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.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.egf.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.feature/sourceTemplateFeature/build.properties
index 031bd7a..9641de1 100644
--- a/features/org.eclipse.egf.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,7 +14,7 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-	           epl-v10.html,\

+	           epl-2.0.html,\

 	           license.html,\

                eclipse_update_120.jpg

 

diff --git a/features/org.eclipse.egf.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.feature/sourceTemplateFeature/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.egf.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.feature/sourceTemplateFeature/feature.properties
index 020f0aa..6955c10 100644
--- a/features/org.eclipse.egf.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2018 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,17 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2018 Eclipse contributors and others.\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +46,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.model.edit.feature/build.properties b/features/org.eclipse.egf.model.edit.feature/build.properties
index 3945d2e..51040b6 100644
--- a/features/org.eclipse.egf.model.edit.feature/build.properties
+++ b/features/org.eclipse.egf.model.edit.feature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,11 +14,11 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-               epl-v10.html,\

+               epl-2.0.html,\

                license.html,\

                eclipse_update_120.jpg,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

 generate.feature@org.eclipse.egf.model.edit.source=org.eclipse.egf.model.edit

diff --git a/features/org.eclipse.egf.model.edit.feature/epl-2.0.html b/features/org.eclipse.egf.model.edit.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.model.edit.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.egf.model.edit.feature/epl-v10.html b/features/org.eclipse.egf.model.edit.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.model.edit.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.model.edit.feature/feature.properties b/features/org.eclipse.egf.model.edit.feature/feature.properties
index 7dcdfb7..1e02203 100644
--- a/features/org.eclipse.egf.model.edit.feature/feature.properties
+++ b/features/org.eclipse.egf.model.edit.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,16 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2018 THALES GLOBAL SERVICES\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +45,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.model.edit.feature/feature.xml b/features/org.eclipse.egf.model.edit.feature/feature.xml
index 8d03a31..5d72660 100644
--- a/features/org.eclipse.egf.model.edit.feature/feature.xml
+++ b/features/org.eclipse.egf.model.edit.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -22,11 +24,7 @@
    </description>

 

    <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.model.edit.feature/license.html b/features/org.eclipse.egf.model.edit.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.model.edit.feature/license.html
+++ b/features/org.eclipse.egf.model.edit.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.model.edit.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.model.edit.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.model.edit.feature/rootfiles/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.egf.model.edit.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.model.edit.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.model.edit.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.model.edit.feature/rootfiles/license.html b/features/org.eclipse.egf.model.edit.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.model.edit.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.model.edit.feature/rootfiles/notice.html b/features/org.eclipse.egf.model.edit.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.model.edit.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.egf.model.edit.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.egf.model.edit.feature/sourceTemplateBundle/plugin.properties
index 4cf43ed..2f7e5fc 100644
--- a/features/org.eclipse.egf.model.edit.feature/sourceTemplateBundle/plugin.properties
+++ b/features/org.eclipse.egf.model.edit.feature/sourceTemplateBundle/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.model.edit.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.model.edit.feature/sourceTemplateFeature/build.properties
index ec40e29..d774351 100644
--- a/features/org.eclipse.egf.model.edit.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.model.edit.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -11,7 +14,7 @@
 
 # NLS_MESSAGEFORMAT_VAR
 bin.includes =\
-epl-v10.html,\
+epl-2.0.html,\
 feature.*,\
 eclipse_update_120.jpg,\
 license.html
diff --git a/features/org.eclipse.egf.model.edit.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.model.edit.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.model.edit.feature/sourceTemplateFeature/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.egf.model.edit.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.model.edit.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2761abd..0000000
--- a/features/org.eclipse.egf.model.edit.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<meta name="ProgId" content="Word.Document">

-<meta name="Generator" content="Microsoft Word 9">

-<meta name="Originator" content="Microsoft Word 9">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.gmf/features/org.eclipse.gmf.sdk-feature/sourceTemplateFeature/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{font-family:Tahoma;

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-generic-font-family:swiss;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	font-family:Tahoma;

-	mso-fareast-font-family:"Times New Roman";}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.model.edit.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.model.edit.feature/sourceTemplateFeature/feature.properties
index 44e8554..9a2c0f2 100644
--- a/features/org.eclipse.egf.model.edit.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.model.edit.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -31,69 +34,144 @@
 # "license" property - text of the "Feature Update License"
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
-Eclipse.org Software User Agreement\n\
-\n\
 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 OTHER MATERIALS FOR OPEN SOURCE PROJECTS\n\
-(COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND\n\
-CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE\n\
-OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND\n\
-CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 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 Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0\n\
-("EPL").  A copy of the EPL is 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, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS\n\
-modules ("Modules") and made available as downloadable archives ("Downloads").\n\
-\n\   
-* Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), 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) in a directory named "plugins".\n\
-* 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 "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins\n\
-  and/or Fragments associated with that Feature.\n\
-* Features may also include other Features ("Included Features"). Within a Feature, \n\
-files named "feature.xml" may contain a list of the names and version numbers of Included Features.\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\
-The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and \n\
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\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 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 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\
-Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the\n\
-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\n\
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.\n\
-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\n\
-that directory.\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\
-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\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 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\
-* 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\
-* IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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 TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please\n\
-contact the Eclipse Foundation to determine what terms and conditions 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\
+Use of Provisioning Technology\n\
+\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\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\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 currently 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, 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 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 Sun Microsystems, Inc. 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.egf.model.edit.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.model.edit.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.model.edit.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.model.edit.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.model.edit.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.egf.model.edit.feature/sourceTemplatePlugin/about.properties
index f3cd112..79d56cd 100644
--- a/features/org.eclipse.egf.model.edit.feature/sourceTemplatePlugin/about.properties
+++ b/features/org.eclipse.egf.model.edit.feature/sourceTemplatePlugin/about.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.model.edit.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.egf.model.edit.feature/sourceTemplatePlugin/build.properties
index 0e50697..da78593 100644
--- a/features/org.eclipse.egf.model.edit.feature/sourceTemplatePlugin/build.properties
+++ b/features/org.eclipse.egf.model.edit.feature/sourceTemplatePlugin/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.model.edit.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.egf.model.edit.feature/sourceTemplatePlugin/plugin.properties
index 4cf43ed..2f7e5fc 100644
--- a/features/org.eclipse.egf.model.edit.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.egf.model.edit.feature/sourceTemplatePlugin/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.model.feature/build.properties b/features/org.eclipse.egf.model.feature/build.properties
index 5b72f7c..2c66fa4 100644
--- a/features/org.eclipse.egf.model.feature/build.properties
+++ b/features/org.eclipse.egf.model.feature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,11 +14,11 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-               epl-v10.html,\

+               epl-2.0.html,\

                license.html,\

                eclipse_update_120.jpg,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

 generate.feature@org.eclipse.egf.model.source=org.eclipse.egf.model

diff --git a/features/org.eclipse.egf.model.feature/epl-2.0.html b/features/org.eclipse.egf.model.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.model.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.egf.model.feature/epl-v10.html b/features/org.eclipse.egf.model.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.model.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.model.feature/feature.properties b/features/org.eclipse.egf.model.feature/feature.properties
index 8e8077b..d21aa5c 100644
--- a/features/org.eclipse.egf.model.feature/feature.properties
+++ b/features/org.eclipse.egf.model.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,16 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2018 THALES GLOBAL SERVICES\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +45,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.model.feature/feature.xml b/features/org.eclipse.egf.model.feature/feature.xml
index 35d639d..ee12afa 100644
--- a/features/org.eclipse.egf.model.feature/feature.xml
+++ b/features/org.eclipse.egf.model.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -22,11 +24,7 @@
    </description>

 

    <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.model.feature/license.html b/features/org.eclipse.egf.model.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.model.feature/license.html
+++ b/features/org.eclipse.egf.model.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.model.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.model.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.model.feature/rootfiles/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.egf.model.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.model.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.model.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.model.feature/rootfiles/license.html b/features/org.eclipse.egf.model.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.model.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.model.feature/rootfiles/notice.html b/features/org.eclipse.egf.model.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.model.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.egf.model.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.egf.model.feature/sourceTemplateBundle/plugin.properties
index d1cbc52..6f1187d 100644
--- a/features/org.eclipse.egf.model.feature/sourceTemplateBundle/plugin.properties
+++ b/features/org.eclipse.egf.model.feature/sourceTemplateBundle/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.model.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.model.feature/sourceTemplateFeature/build.properties
index ec40e29..d774351 100644
--- a/features/org.eclipse.egf.model.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.model.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -11,7 +14,7 @@
 
 # NLS_MESSAGEFORMAT_VAR
 bin.includes =\
-epl-v10.html,\
+epl-2.0.html,\
 feature.*,\
 eclipse_update_120.jpg,\
 license.html
diff --git a/features/org.eclipse.egf.model.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.model.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.model.feature/sourceTemplateFeature/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.egf.model.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.model.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2761abd..0000000
--- a/features/org.eclipse.egf.model.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<meta name="ProgId" content="Word.Document">

-<meta name="Generator" content="Microsoft Word 9">

-<meta name="Originator" content="Microsoft Word 9">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.gmf/features/org.eclipse.gmf.sdk-feature/sourceTemplateFeature/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{font-family:Tahoma;

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-generic-font-family:swiss;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	font-family:Tahoma;

-	mso-fareast-font-family:"Times New Roman";}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.model.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.model.feature/sourceTemplateFeature/feature.properties
index 78d889d..02fd009 100644
--- a/features/org.eclipse.egf.model.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.model.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -32,125 +35,143 @@
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-February 1, 2011\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\
-       - 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\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\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.egf.model.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.model.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.model.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.model.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.model.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.egf.model.feature/sourceTemplatePlugin/about.properties
index d9ba0b1..14a93ce 100644
--- a/features/org.eclipse.egf.model.feature/sourceTemplatePlugin/about.properties
+++ b/features/org.eclipse.egf.model.feature/sourceTemplatePlugin/about.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.model.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.egf.model.feature/sourceTemplatePlugin/build.properties
index 0e50697..da78593 100644
--- a/features/org.eclipse.egf.model.feature/sourceTemplatePlugin/build.properties
+++ b/features/org.eclipse.egf.model.feature/sourceTemplatePlugin/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.model.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.egf.model.feature/sourceTemplatePlugin/plugin.properties
index d1cbc52..6f1187d 100644
--- a/features/org.eclipse.egf.model.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.egf.model.feature/sourceTemplatePlugin/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.model.fprod.edit.feature/build.properties b/features/org.eclipse.egf.model.fprod.edit.feature/build.properties
index 5c64499..2dfcbac 100644
--- a/features/org.eclipse.egf.model.fprod.edit.feature/build.properties
+++ b/features/org.eclipse.egf.model.fprod.edit.feature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,11 +14,11 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-               epl-v10.html,\

+               epl-2.0.html,\

                license.html,\

                eclipse_update_120.jpg,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

 generate.feature@org.eclipse.egf.model.fprod.edit.source=org.eclipse.egf.model.fprod.edit

diff --git a/features/org.eclipse.egf.model.fprod.edit.feature/epl-2.0.html b/features/org.eclipse.egf.model.fprod.edit.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.model.fprod.edit.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.egf.model.fprod.edit.feature/epl-v10.html b/features/org.eclipse.egf.model.fprod.edit.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.model.fprod.edit.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.model.fprod.edit.feature/feature.properties b/features/org.eclipse.egf.model.fprod.edit.feature/feature.properties
index 35129e1..5efcf5c 100644
--- a/features/org.eclipse.egf.model.fprod.edit.feature/feature.properties
+++ b/features/org.eclipse.egf.model.fprod.edit.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,16 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2018 THALES GLOBAL SERVICES\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +45,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.model.fprod.edit.feature/feature.xml b/features/org.eclipse.egf.model.fprod.edit.feature/feature.xml
index c62b8d6..8159c39 100644
--- a/features/org.eclipse.egf.model.fprod.edit.feature/feature.xml
+++ b/features/org.eclipse.egf.model.fprod.edit.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -22,11 +24,7 @@
    </description>

 

    <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.model.fprod.edit.feature/license.html b/features/org.eclipse.egf.model.fprod.edit.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.model.fprod.edit.feature/license.html
+++ b/features/org.eclipse.egf.model.fprod.edit.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.model.fprod.edit.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.model.fprod.edit.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.model.fprod.edit.feature/rootfiles/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.egf.model.fprod.edit.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.model.fprod.edit.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.model.fprod.edit.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.model.fprod.edit.feature/rootfiles/license.html b/features/org.eclipse.egf.model.fprod.edit.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.model.fprod.edit.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.model.fprod.edit.feature/rootfiles/notice.html b/features/org.eclipse.egf.model.fprod.edit.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.model.fprod.edit.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.egf.model.fprod.edit.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplateBundle/plugin.properties
index 5c92059..5ac17a9 100644
--- a/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplateBundle/plugin.properties
+++ b/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplateBundle/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplateFeature/build.properties
index ec40e29..d774351 100644
--- a/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -11,7 +14,7 @@
 
 # NLS_MESSAGEFORMAT_VAR
 bin.includes =\
-epl-v10.html,\
+epl-2.0.html,\
 feature.*,\
 eclipse_update_120.jpg,\
 license.html
diff --git a/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplateFeature/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.egf.model.fprod.edit.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2761abd..0000000
--- a/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<meta name="ProgId" content="Word.Document">

-<meta name="Generator" content="Microsoft Word 9">

-<meta name="Originator" content="Microsoft Word 9">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.gmf/features/org.eclipse.gmf.sdk-feature/sourceTemplateFeature/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{font-family:Tahoma;

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-generic-font-family:swiss;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	font-family:Tahoma;

-	mso-fareast-font-family:"Times New Roman";}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplateFeature/feature.properties
index 3df782e..1a67cae 100644
--- a/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,17 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2018 Eclipse contributors and others.\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +46,143 @@
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-February 1, 2011\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\
-       - 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\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\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.egf.model.fprod.edit.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.model.fprod.edit.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplatePlugin/about.properties
index fde6d6e..93f792f 100644
--- a/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplatePlugin/about.properties
+++ b/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplatePlugin/about.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplatePlugin/build.properties
index 0e50697..da78593 100644
--- a/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplatePlugin/build.properties
+++ b/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplatePlugin/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplatePlugin/plugin.properties
index 5c92059..5ac17a9 100644
--- a/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.egf.model.fprod.edit.feature/sourceTemplatePlugin/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.model.fprod.feature/build.properties b/features/org.eclipse.egf.model.fprod.feature/build.properties
index 6bcbca9..0f3a1e6 100644
--- a/features/org.eclipse.egf.model.fprod.feature/build.properties
+++ b/features/org.eclipse.egf.model.fprod.feature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,11 +14,11 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-               epl-v10.html,\

+               epl-2.0.html,\

                license.html,\

                eclipse_update_120.jpg,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

 generate.feature@org.eclipse.egf.model.fprod.source=org.eclipse.egf.model.fprod

diff --git a/features/org.eclipse.egf.model.fprod.feature/epl-2.0.html b/features/org.eclipse.egf.model.fprod.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.model.fprod.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.egf.model.fprod.feature/epl-v10.html b/features/org.eclipse.egf.model.fprod.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.model.fprod.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.model.fprod.feature/feature.properties b/features/org.eclipse.egf.model.fprod.feature/feature.properties
index 9d6c993..cacf2ca 100644
--- a/features/org.eclipse.egf.model.fprod.feature/feature.properties
+++ b/features/org.eclipse.egf.model.fprod.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,17 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2018 Eclipse contributors and others.\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +46,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.model.fprod.feature/feature.xml b/features/org.eclipse.egf.model.fprod.feature/feature.xml
index b350d12..5dd125a 100644
--- a/features/org.eclipse.egf.model.fprod.feature/feature.xml
+++ b/features/org.eclipse.egf.model.fprod.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -22,11 +24,7 @@
    </description>

 

    <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+ 	%copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.model.fprod.feature/license.html b/features/org.eclipse.egf.model.fprod.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.model.fprod.feature/license.html
+++ b/features/org.eclipse.egf.model.fprod.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.model.fprod.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.model.fprod.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.model.fprod.feature/rootfiles/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.egf.model.fprod.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.model.fprod.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.model.fprod.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.model.fprod.feature/rootfiles/license.html b/features/org.eclipse.egf.model.fprod.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.model.fprod.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.model.fprod.feature/rootfiles/notice.html b/features/org.eclipse.egf.model.fprod.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.model.fprod.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.egf.model.fprod.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.egf.model.fprod.feature/sourceTemplateBundle/plugin.properties
index aebe0c2..30da58e 100644
--- a/features/org.eclipse.egf.model.fprod.feature/sourceTemplateBundle/plugin.properties
+++ b/features/org.eclipse.egf.model.fprod.feature/sourceTemplateBundle/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.model.fprod.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.model.fprod.feature/sourceTemplateFeature/build.properties
index ec40e29..d774351 100644
--- a/features/org.eclipse.egf.model.fprod.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.model.fprod.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -11,7 +14,7 @@
 
 # NLS_MESSAGEFORMAT_VAR
 bin.includes =\
-epl-v10.html,\
+epl-2.0.html,\
 feature.*,\
 eclipse_update_120.jpg,\
 license.html
diff --git a/features/org.eclipse.egf.model.fprod.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.model.fprod.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.model.fprod.feature/sourceTemplateFeature/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.egf.model.fprod.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.model.fprod.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2761abd..0000000
--- a/features/org.eclipse.egf.model.fprod.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<meta name="ProgId" content="Word.Document">

-<meta name="Generator" content="Microsoft Word 9">

-<meta name="Originator" content="Microsoft Word 9">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.gmf/features/org.eclipse.gmf.sdk-feature/sourceTemplateFeature/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{font-family:Tahoma;

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-generic-font-family:swiss;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	font-family:Tahoma;

-	mso-fareast-font-family:"Times New Roman";}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.model.fprod.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.model.fprod.feature/sourceTemplateFeature/feature.properties
index cbc8895..bfe5143 100644
--- a/features/org.eclipse.egf.model.fprod.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.model.fprod.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,16 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2018 THALES GLOBAL SERVICES\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +45,143 @@
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-February 1, 2011\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\
-       - 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\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\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.egf.model.fprod.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.model.fprod.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.model.fprod.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.model.fprod.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.model.fprod.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.egf.model.fprod.feature/sourceTemplatePlugin/about.properties
index 34965f9..39c20fd 100644
--- a/features/org.eclipse.egf.model.fprod.feature/sourceTemplatePlugin/about.properties
+++ b/features/org.eclipse.egf.model.fprod.feature/sourceTemplatePlugin/about.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.model.fprod.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.egf.model.fprod.feature/sourceTemplatePlugin/build.properties
index 0e50697..da78593 100644
--- a/features/org.eclipse.egf.model.fprod.feature/sourceTemplatePlugin/build.properties
+++ b/features/org.eclipse.egf.model.fprod.feature/sourceTemplatePlugin/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.model.fprod.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.egf.model.fprod.feature/sourceTemplatePlugin/plugin.properties
index aebe0c2..30da58e 100644
--- a/features/org.eclipse.egf.model.fprod.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.egf.model.fprod.feature/sourceTemplatePlugin/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.model.ftask.edit.feature/build.properties b/features/org.eclipse.egf.model.ftask.edit.feature/build.properties
index 109057a..f78a521 100644
--- a/features/org.eclipse.egf.model.ftask.edit.feature/build.properties
+++ b/features/org.eclipse.egf.model.ftask.edit.feature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,11 +14,11 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-               epl-v10.html,\

+               epl-2.0.html,\

                license.html,\

                eclipse_update_120.jpg,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

 generate.feature@org.eclipse.egf.model.ftask.edit.source=org.eclipse.egf.model.ftask.edit

diff --git a/features/org.eclipse.egf.model.ftask.edit.feature/epl-2.0.html b/features/org.eclipse.egf.model.ftask.edit.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.model.ftask.edit.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.egf.model.ftask.edit.feature/epl-v10.html b/features/org.eclipse.egf.model.ftask.edit.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.model.ftask.edit.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.model.ftask.edit.feature/feature.properties b/features/org.eclipse.egf.model.ftask.edit.feature/feature.properties
index 608752f..256c218 100644
--- a/features/org.eclipse.egf.model.ftask.edit.feature/feature.properties
+++ b/features/org.eclipse.egf.model.ftask.edit.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,17 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2018 Eclipse contributors and others.\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +46,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.model.ftask.edit.feature/feature.xml b/features/org.eclipse.egf.model.ftask.edit.feature/feature.xml
index 32af693..ba55d49 100644
--- a/features/org.eclipse.egf.model.ftask.edit.feature/feature.xml
+++ b/features/org.eclipse.egf.model.ftask.edit.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -23,11 +25,7 @@
     </description>

 

     <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

     </copyright>

 

     <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.model.ftask.edit.feature/license.html b/features/org.eclipse.egf.model.ftask.edit.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.model.ftask.edit.feature/license.html
+++ b/features/org.eclipse.egf.model.ftask.edit.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.model.ftask.edit.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.model.ftask.edit.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.model.ftask.edit.feature/rootfiles/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.egf.model.ftask.edit.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.model.ftask.edit.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.model.ftask.edit.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.model.ftask.edit.feature/rootfiles/license.html b/features/org.eclipse.egf.model.ftask.edit.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.model.ftask.edit.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.model.ftask.edit.feature/rootfiles/notice.html b/features/org.eclipse.egf.model.ftask.edit.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.model.ftask.edit.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.egf.model.ftask.edit.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplateBundle/plugin.properties
index 3863122..60716d0 100644
--- a/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplateBundle/plugin.properties
+++ b/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplateBundle/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplateFeature/build.properties
index ec40e29..d774351 100644
--- a/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -11,7 +14,7 @@
 
 # NLS_MESSAGEFORMAT_VAR
 bin.includes =\
-epl-v10.html,\
+epl-2.0.html,\
 feature.*,\
 eclipse_update_120.jpg,\
 license.html
diff --git a/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplateFeature/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.egf.model.ftask.edit.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2761abd..0000000
--- a/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<meta name="ProgId" content="Word.Document">

-<meta name="Generator" content="Microsoft Word 9">

-<meta name="Originator" content="Microsoft Word 9">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.gmf/features/org.eclipse.gmf.sdk-feature/sourceTemplateFeature/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{font-family:Tahoma;

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-generic-font-family:swiss;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	font-family:Tahoma;

-	mso-fareast-font-family:"Times New Roman";}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplateFeature/feature.properties
index 7cff723..1cb8995 100644
--- a/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,16 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2018 THALES GLOBAL SERVICES\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +45,143 @@
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-February 1, 2011\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\
-       - 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\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\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.egf.model.ftask.edit.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.model.ftask.edit.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplatePlugin/about.properties
index c4b0378..b9f2547 100644
--- a/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplatePlugin/about.properties
+++ b/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplatePlugin/about.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplatePlugin/build.properties
index 0e50697..da78593 100644
--- a/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplatePlugin/build.properties
+++ b/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplatePlugin/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplatePlugin/plugin.properties
index 3863122..60716d0 100644
--- a/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.egf.model.ftask.edit.feature/sourceTemplatePlugin/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.model.ftask.feature/build.properties b/features/org.eclipse.egf.model.ftask.feature/build.properties
index 2dfa7d5..2d214e3 100644
--- a/features/org.eclipse.egf.model.ftask.feature/build.properties
+++ b/features/org.eclipse.egf.model.ftask.feature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,11 +14,11 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-               epl-v10.html,\

+               epl-2.0.html,\

                license.html,\

                eclipse_update_120.jpg,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

 generate.feature@org.eclipse.egf.model.ftask.source=org.eclipse.egf.model.ftask

diff --git a/features/org.eclipse.egf.model.ftask.feature/epl-2.0.html b/features/org.eclipse.egf.model.ftask.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.model.ftask.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.egf.model.ftask.feature/epl-v10.html b/features/org.eclipse.egf.model.ftask.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.model.ftask.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.model.ftask.feature/feature.properties b/features/org.eclipse.egf.model.ftask.feature/feature.properties
index f3f6149..2273ed3 100644
--- a/features/org.eclipse.egf.model.ftask.feature/feature.properties
+++ b/features/org.eclipse.egf.model.ftask.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -32,125 +35,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.model.ftask.feature/feature.xml b/features/org.eclipse.egf.model.ftask.feature/feature.xml
index 5b87f3b..5300704 100644
--- a/features/org.eclipse.egf.model.ftask.feature/feature.xml
+++ b/features/org.eclipse.egf.model.ftask.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -23,11 +25,7 @@
     </description>

 

     <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

     </copyright>

 

     <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.model.ftask.feature/license.html b/features/org.eclipse.egf.model.ftask.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.model.ftask.feature/license.html
+++ b/features/org.eclipse.egf.model.ftask.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.model.ftask.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.model.ftask.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.model.ftask.feature/rootfiles/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.egf.model.ftask.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.model.ftask.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.model.ftask.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.model.ftask.feature/rootfiles/license.html b/features/org.eclipse.egf.model.ftask.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.model.ftask.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.model.ftask.feature/rootfiles/notice.html b/features/org.eclipse.egf.model.ftask.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.model.ftask.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.egf.model.ftask.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.egf.model.ftask.feature/sourceTemplateBundle/plugin.properties
index 22102fb..bbb0ed0 100644
--- a/features/org.eclipse.egf.model.ftask.feature/sourceTemplateBundle/plugin.properties
+++ b/features/org.eclipse.egf.model.ftask.feature/sourceTemplateBundle/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.model.ftask.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.model.ftask.feature/sourceTemplateFeature/build.properties
index ec40e29..d774351 100644
--- a/features/org.eclipse.egf.model.ftask.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.model.ftask.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -11,7 +14,7 @@
 
 # NLS_MESSAGEFORMAT_VAR
 bin.includes =\
-epl-v10.html,\
+epl-2.0.html,\
 feature.*,\
 eclipse_update_120.jpg,\
 license.html
diff --git a/features/org.eclipse.egf.model.ftask.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.model.ftask.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.model.ftask.feature/sourceTemplateFeature/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.egf.model.ftask.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.model.ftask.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2761abd..0000000
--- a/features/org.eclipse.egf.model.ftask.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<meta name="ProgId" content="Word.Document">

-<meta name="Generator" content="Microsoft Word 9">

-<meta name="Originator" content="Microsoft Word 9">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.gmf/features/org.eclipse.gmf.sdk-feature/sourceTemplateFeature/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{font-family:Tahoma;

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-generic-font-family:swiss;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	font-family:Tahoma;

-	mso-fareast-font-family:"Times New Roman";}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.model.ftask.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.model.ftask.feature/sourceTemplateFeature/feature.properties
index 5119f0a..ef5d1f7 100644
--- a/features/org.eclipse.egf.model.ftask.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.model.ftask.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -32,125 +35,143 @@
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-February 1, 2011\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\
-       - 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\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\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.egf.model.ftask.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.model.ftask.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.model.ftask.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.model.ftask.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.model.ftask.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.egf.model.ftask.feature/sourceTemplatePlugin/about.properties
index e544f17..f8409f8 100644
--- a/features/org.eclipse.egf.model.ftask.feature/sourceTemplatePlugin/about.properties
+++ b/features/org.eclipse.egf.model.ftask.feature/sourceTemplatePlugin/about.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.model.ftask.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.egf.model.ftask.feature/sourceTemplatePlugin/build.properties
index 0e50697..da78593 100644
--- a/features/org.eclipse.egf.model.ftask.feature/sourceTemplatePlugin/build.properties
+++ b/features/org.eclipse.egf.model.ftask.feature/sourceTemplatePlugin/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.model.ftask.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.egf.model.ftask.feature/sourceTemplatePlugin/plugin.properties
index 22102fb..bbb0ed0 100644
--- a/features/org.eclipse.egf.model.ftask.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.egf.model.ftask.feature/sourceTemplatePlugin/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.model.ui.feature/build.properties b/features/org.eclipse.egf.model.ui.feature/build.properties
index 6c772ca..189fdd6 100644
--- a/features/org.eclipse.egf.model.ui.feature/build.properties
+++ b/features/org.eclipse.egf.model.ui.feature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -13,9 +16,9 @@
 bin.includes = feature.*,\

                license.html,\

                eclipse_update_120.jpg,\

-               epl-v10.html,\

+               epl-2.0.html,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

 generate.feature@org.eclipse.egf.model.ui.source=org.eclipse.egf.model.ui

diff --git a/features/org.eclipse.egf.model.ui.feature/epl-2.0.html b/features/org.eclipse.egf.model.ui.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.model.ui.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.egf.model.ui.feature/epl-v10.html b/features/org.eclipse.egf.model.ui.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.model.ui.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.model.ui.feature/feature.properties b/features/org.eclipse.egf.model.ui.feature/feature.properties
index 06a7212..274639c 100644
--- a/features/org.eclipse.egf.model.ui.feature/feature.properties
+++ b/features/org.eclipse.egf.model.ui.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -32,125 +35,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.model.ui.feature/feature.xml b/features/org.eclipse.egf.model.ui.feature/feature.xml
index 5616349..44ed161 100644
--- a/features/org.eclipse.egf.model.ui.feature/feature.xml
+++ b/features/org.eclipse.egf.model.ui.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -22,11 +24,7 @@
    </description>

 

    <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.model.ui.feature/license.html b/features/org.eclipse.egf.model.ui.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.model.ui.feature/license.html
+++ b/features/org.eclipse.egf.model.ui.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.model.ui.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.model.ui.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.model.ui.feature/rootfiles/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.egf.model.ui.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.model.ui.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.model.ui.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.model.ui.feature/rootfiles/license.html b/features/org.eclipse.egf.model.ui.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.model.ui.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.model.ui.feature/rootfiles/notice.html b/features/org.eclipse.egf.model.ui.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.model.ui.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.egf.model.ui.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.egf.model.ui.feature/sourceTemplateBundle/plugin.properties
index 1dcd433..8bdb06f 100644
--- a/features/org.eclipse.egf.model.ui.feature/sourceTemplateBundle/plugin.properties
+++ b/features/org.eclipse.egf.model.ui.feature/sourceTemplateBundle/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.model.ui.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.model.ui.feature/sourceTemplateFeature/build.properties
index ec40e29..d774351 100644
--- a/features/org.eclipse.egf.model.ui.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.model.ui.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -11,7 +14,7 @@
 
 # NLS_MESSAGEFORMAT_VAR
 bin.includes =\
-epl-v10.html,\
+epl-2.0.html,\
 feature.*,\
 eclipse_update_120.jpg,\
 license.html
diff --git a/features/org.eclipse.egf.model.ui.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.model.ui.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.model.ui.feature/sourceTemplateFeature/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.egf.model.ui.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.model.ui.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2761abd..0000000
--- a/features/org.eclipse.egf.model.ui.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<meta name="ProgId" content="Word.Document">

-<meta name="Generator" content="Microsoft Word 9">

-<meta name="Originator" content="Microsoft Word 9">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.gmf/features/org.eclipse.gmf.sdk-feature/sourceTemplateFeature/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{font-family:Tahoma;

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-generic-font-family:swiss;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	font-family:Tahoma;

-	mso-fareast-font-family:"Times New Roman";}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.model.ui.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.model.ui.feature/sourceTemplateFeature/feature.properties
index 2f67801..62c7007 100644
--- a/features/org.eclipse.egf.model.ui.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.model.ui.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,17 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2018 Eclipse contributors and others.\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +46,143 @@
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-February 1, 2011\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\
-       - 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\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\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.egf.model.ui.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.model.ui.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.model.ui.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.model.ui.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.model.ui.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.egf.model.ui.feature/sourceTemplatePlugin/about.properties
index 333b0bd..28e7bde 100644
--- a/features/org.eclipse.egf.model.ui.feature/sourceTemplatePlugin/about.properties
+++ b/features/org.eclipse.egf.model.ui.feature/sourceTemplatePlugin/about.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.model.ui.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.egf.model.ui.feature/sourceTemplatePlugin/build.properties
index 0e50697..da78593 100644
--- a/features/org.eclipse.egf.model.ui.feature/sourceTemplatePlugin/build.properties
+++ b/features/org.eclipse.egf.model.ui.feature/sourceTemplatePlugin/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.model.ui.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.egf.model.ui.feature/sourceTemplatePlugin/plugin.properties
index 1dcd433..8bdb06f 100644
--- a/features/org.eclipse.egf.model.ui.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.egf.model.ui.feature/sourceTemplatePlugin/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/build.properties b/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/build.properties
index dd1bf22..67f2bea 100644
--- a/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/build.properties
+++ b/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,11 +14,11 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-               epl-v10.html,\

+               epl-2.0.html,\

                license.html,\

                eclipse_update_120.jpg,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

 	               
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/epl-2.0.html b/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.acceleo3.examples.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.egf.portfolio.acceleo3.examples.feature/epl-v10.html b/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/feature.properties b/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/feature.properties
index 2259708..b08a7c3 100644
--- a/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/feature.properties
+++ b/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,16 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2018 THALES GLOBAL SERVICES\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +45,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.portfolio.acceleo3.examples.feature/feature.xml b/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/feature.xml
index 0c57764..9fd55dc 100644
--- a/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/feature.xml
+++ b/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -21,11 +23,7 @@
    </description>

 

    <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/license.html b/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/license.html
+++ b/features/org.eclipse.egf.portfolio.acceleo3.examples.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.portfolio.acceleo3.examples.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/rootfiles/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.egf.portfolio.acceleo3.examples.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/rootfiles/license.html b/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.portfolio.acceleo3.examples.feature/rootfiles/notice.html b/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.portfolio.acceleo3.examples.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.egf.portfolio.acceleo3.examples.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/sourceTemplateFeature/build.properties
index 20aacf2..3862f7f 100644
--- a/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,7 +14,7 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-	           epl-v10.html,\

+	           epl-2.0.html,\

 	           license.html,\

                eclipse_update_120.jpg

 	               
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/sourceTemplateFeature/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.egf.portfolio.acceleo3.examples.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/sourceTemplateFeature/feature.properties
index 145d7d1..7b533f3 100644
--- a/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,16 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2018 THALES GLOBAL SERVICES\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +45,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.portfolio.acceleo3.examples.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.portfolio.acceleo3.feature/build.properties b/features/org.eclipse.egf.portfolio.acceleo3.feature/build.properties
index dd1bf22..67f2bea 100644
--- a/features/org.eclipse.egf.portfolio.acceleo3.feature/build.properties
+++ b/features/org.eclipse.egf.portfolio.acceleo3.feature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,11 +14,11 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-               epl-v10.html,\

+               epl-2.0.html,\

                license.html,\

                eclipse_update_120.jpg,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

 	               
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.acceleo3.feature/epl-2.0.html b/features/org.eclipse.egf.portfolio.acceleo3.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.acceleo3.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.egf.portfolio.acceleo3.feature/epl-v10.html b/features/org.eclipse.egf.portfolio.acceleo3.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.portfolio.acceleo3.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.acceleo3.feature/feature.properties b/features/org.eclipse.egf.portfolio.acceleo3.feature/feature.properties
index 2259708..f11e2c8 100644
--- a/features/org.eclipse.egf.portfolio.acceleo3.feature/feature.properties
+++ b/features/org.eclipse.egf.portfolio.acceleo3.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -32,125 +35,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.portfolio.acceleo3.feature/feature.xml b/features/org.eclipse.egf.portfolio.acceleo3.feature/feature.xml
index 8dd02e8..7683ba2 100644
--- a/features/org.eclipse.egf.portfolio.acceleo3.feature/feature.xml
+++ b/features/org.eclipse.egf.portfolio.acceleo3.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -21,11 +23,7 @@
    </description>

 

    <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.portfolio.acceleo3.feature/license.html b/features/org.eclipse.egf.portfolio.acceleo3.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.portfolio.acceleo3.feature/license.html
+++ b/features/org.eclipse.egf.portfolio.acceleo3.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.portfolio.acceleo3.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.portfolio.acceleo3.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.acceleo3.feature/rootfiles/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.egf.portfolio.acceleo3.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.portfolio.acceleo3.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.portfolio.acceleo3.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.acceleo3.feature/rootfiles/license.html b/features/org.eclipse.egf.portfolio.acceleo3.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.acceleo3.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.portfolio.acceleo3.feature/rootfiles/notice.html b/features/org.eclipse.egf.portfolio.acceleo3.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.portfolio.acceleo3.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.egf.portfolio.acceleo3.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.portfolio.acceleo3.feature/sourceTemplateFeature/build.properties
index 20aacf2..3862f7f 100644
--- a/features/org.eclipse.egf.portfolio.acceleo3.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.portfolio.acceleo3.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,7 +14,7 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-	           epl-v10.html,\

+	           epl-2.0.html,\

 	           license.html,\

                eclipse_update_120.jpg

 	               
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.acceleo3.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.portfolio.acceleo3.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.acceleo3.feature/sourceTemplateFeature/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.egf.portfolio.acceleo3.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.portfolio.acceleo3.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.portfolio.acceleo3.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.acceleo3.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.portfolio.acceleo3.feature/sourceTemplateFeature/feature.properties
index 145d7d1..8cea405 100644
--- a/features/org.eclipse.egf.portfolio.acceleo3.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.portfolio.acceleo3.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,17 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2018 Eclipse contributors and others.\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +46,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.portfolio.acceleo3.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.portfolio.acceleo3.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.portfolio.acceleo3.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.portfolio.acceleo3.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.portfolio.atl.examples.feature/build.properties b/features/org.eclipse.egf.portfolio.atl.examples.feature/build.properties
index dd1bf22..67f2bea 100644
--- a/features/org.eclipse.egf.portfolio.atl.examples.feature/build.properties
+++ b/features/org.eclipse.egf.portfolio.atl.examples.feature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,11 +14,11 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-               epl-v10.html,\

+               epl-2.0.html,\

                license.html,\

                eclipse_update_120.jpg,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

 	               
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.atl.examples.feature/epl-2.0.html b/features/org.eclipse.egf.portfolio.atl.examples.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.atl.examples.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.egf.portfolio.atl.examples.feature/epl-v10.html b/features/org.eclipse.egf.portfolio.atl.examples.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.portfolio.atl.examples.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.atl.examples.feature/feature.properties b/features/org.eclipse.egf.portfolio.atl.examples.feature/feature.properties
index 2259708..b08a7c3 100644
--- a/features/org.eclipse.egf.portfolio.atl.examples.feature/feature.properties
+++ b/features/org.eclipse.egf.portfolio.atl.examples.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,16 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2018 THALES GLOBAL SERVICES\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +45,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.portfolio.atl.examples.feature/feature.xml b/features/org.eclipse.egf.portfolio.atl.examples.feature/feature.xml
index 932ea6c..6cbe50c 100644
--- a/features/org.eclipse.egf.portfolio.atl.examples.feature/feature.xml
+++ b/features/org.eclipse.egf.portfolio.atl.examples.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -21,11 +23,7 @@
    </description>

 

    <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.portfolio.atl.examples.feature/license.html b/features/org.eclipse.egf.portfolio.atl.examples.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.portfolio.atl.examples.feature/license.html
+++ b/features/org.eclipse.egf.portfolio.atl.examples.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.portfolio.atl.examples.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.portfolio.atl.examples.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.atl.examples.feature/rootfiles/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.egf.portfolio.atl.examples.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.portfolio.atl.examples.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.portfolio.atl.examples.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.atl.examples.feature/rootfiles/license.html b/features/org.eclipse.egf.portfolio.atl.examples.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.atl.examples.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.portfolio.atl.examples.feature/rootfiles/notice.html b/features/org.eclipse.egf.portfolio.atl.examples.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.portfolio.atl.examples.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.egf.portfolio.atl.examples.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.portfolio.atl.examples.feature/sourceTemplateFeature/build.properties
index 20aacf2..3862f7f 100644
--- a/features/org.eclipse.egf.portfolio.atl.examples.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.portfolio.atl.examples.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,7 +14,7 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-	           epl-v10.html,\

+	           epl-2.0.html,\

 	           license.html,\

                eclipse_update_120.jpg

 	               
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.atl.examples.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.portfolio.atl.examples.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.atl.examples.feature/sourceTemplateFeature/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.egf.portfolio.atl.examples.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.portfolio.atl.examples.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.portfolio.atl.examples.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.atl.examples.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.portfolio.atl.examples.feature/sourceTemplateFeature/feature.properties
index 145d7d1..8cea405 100644
--- a/features/org.eclipse.egf.portfolio.atl.examples.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.portfolio.atl.examples.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,17 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2018 Eclipse contributors and others.\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +46,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.portfolio.atl.examples.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.portfolio.atl.examples.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.portfolio.atl.examples.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.portfolio.atl.examples.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.portfolio.atl.feature/build.properties b/features/org.eclipse.egf.portfolio.atl.feature/build.properties
index dd1bf22..67f2bea 100644
--- a/features/org.eclipse.egf.portfolio.atl.feature/build.properties
+++ b/features/org.eclipse.egf.portfolio.atl.feature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,11 +14,11 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-               epl-v10.html,\

+               epl-2.0.html,\

                license.html,\

                eclipse_update_120.jpg,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

 	               
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.atl.feature/epl-2.0.html b/features/org.eclipse.egf.portfolio.atl.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.atl.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.egf.portfolio.atl.feature/epl-v10.html b/features/org.eclipse.egf.portfolio.atl.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.portfolio.atl.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.atl.feature/feature.properties b/features/org.eclipse.egf.portfolio.atl.feature/feature.properties
index dad91f3..b6b49dd 100644
--- a/features/org.eclipse.egf.portfolio.atl.feature/feature.properties
+++ b/features/org.eclipse.egf.portfolio.atl.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -32,125 +35,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.portfolio.atl.feature/feature.xml b/features/org.eclipse.egf.portfolio.atl.feature/feature.xml
index ca65800..1862370 100644
--- a/features/org.eclipse.egf.portfolio.atl.feature/feature.xml
+++ b/features/org.eclipse.egf.portfolio.atl.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -21,11 +23,7 @@
    </description>

 

    <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.portfolio.atl.feature/license.html b/features/org.eclipse.egf.portfolio.atl.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.portfolio.atl.feature/license.html
+++ b/features/org.eclipse.egf.portfolio.atl.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.portfolio.atl.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.portfolio.atl.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.atl.feature/rootfiles/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.egf.portfolio.atl.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.portfolio.atl.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.portfolio.atl.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.atl.feature/rootfiles/license.html b/features/org.eclipse.egf.portfolio.atl.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.atl.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.portfolio.atl.feature/rootfiles/notice.html b/features/org.eclipse.egf.portfolio.atl.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.portfolio.atl.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.egf.portfolio.atl.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.portfolio.atl.feature/sourceTemplateFeature/build.properties
index 20aacf2..3862f7f 100644
--- a/features/org.eclipse.egf.portfolio.atl.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.portfolio.atl.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,7 +14,7 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-	           epl-v10.html,\

+	           epl-2.0.html,\

 	           license.html,\

                eclipse_update_120.jpg

 	               
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.atl.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.portfolio.atl.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.atl.feature/sourceTemplateFeature/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.egf.portfolio.atl.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.portfolio.atl.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.portfolio.atl.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.atl.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.portfolio.atl.feature/sourceTemplateFeature/feature.properties
index 4e19c0e..7313656 100644
--- a/features/org.eclipse.egf.portfolio.atl.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.portfolio.atl.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,17 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2018 Eclipse contributors and others.\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +46,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.portfolio.atl.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.portfolio.atl.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.portfolio.atl.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.portfolio.atl.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.portfolio.emf.feature/build.properties b/features/org.eclipse.egf.portfolio.emf.feature/build.properties
index 40dc74c..1c7cead 100644
--- a/features/org.eclipse.egf.portfolio.emf.feature/build.properties
+++ b/features/org.eclipse.egf.portfolio.emf.feature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,11 +14,11 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-               epl-v10.html,\

+               epl-2.0.html,\

                license.html,\

                eclipse_update_120.jpg,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

 generate.feature@org.eclipse.egf.portfolio.emf.source=org.eclipse.egf.portfolio.emf

diff --git a/features/org.eclipse.egf.portfolio.emf.feature/epl-2.0.html b/features/org.eclipse.egf.portfolio.emf.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.emf.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.egf.portfolio.emf.feature/epl-v10.html b/features/org.eclipse.egf.portfolio.emf.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.portfolio.emf.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.emf.feature/feature.properties b/features/org.eclipse.egf.portfolio.emf.feature/feature.properties
index 4e4a1a0..708d3b7 100644
--- a/features/org.eclipse.egf.portfolio.emf.feature/feature.properties
+++ b/features/org.eclipse.egf.portfolio.emf.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -32,125 +35,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.portfolio.emf.feature/feature.xml b/features/org.eclipse.egf.portfolio.emf.feature/feature.xml
index bf9c800..01d38d6 100644
--- a/features/org.eclipse.egf.portfolio.emf.feature/feature.xml
+++ b/features/org.eclipse.egf.portfolio.emf.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -22,11 +24,7 @@
    </description>

 

    <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.portfolio.emf.feature/license.html b/features/org.eclipse.egf.portfolio.emf.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.portfolio.emf.feature/license.html
+++ b/features/org.eclipse.egf.portfolio.emf.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.portfolio.emf.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.portfolio.emf.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.emf.feature/rootfiles/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.egf.portfolio.emf.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.portfolio.emf.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.portfolio.emf.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.emf.feature/rootfiles/license.html b/features/org.eclipse.egf.portfolio.emf.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.emf.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.portfolio.emf.feature/rootfiles/notice.html b/features/org.eclipse.egf.portfolio.emf.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.portfolio.emf.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.egf.portfolio.emf.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplateBundle/plugin.properties
index 4058fa9..88dc3c1 100644
--- a/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplateBundle/plugin.properties
+++ b/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplateBundle/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplateFeature/build.properties
index ec40e29..d774351 100644
--- a/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -11,7 +14,7 @@
 
 # NLS_MESSAGEFORMAT_VAR
 bin.includes =\
-epl-v10.html,\
+epl-2.0.html,\
 feature.*,\
 eclipse_update_120.jpg,\
 license.html
diff --git a/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplateFeature/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.egf.portfolio.emf.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2761abd..0000000
--- a/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<meta name="ProgId" content="Word.Document">

-<meta name="Generator" content="Microsoft Word 9">

-<meta name="Originator" content="Microsoft Word 9">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.gmf/features/org.eclipse.gmf.sdk-feature/sourceTemplateFeature/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{font-family:Tahoma;

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-generic-font-family:swiss;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	font-family:Tahoma;

-	mso-fareast-font-family:"Times New Roman";}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplateFeature/feature.properties
index 222845f..5bf633e 100644
--- a/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,17 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2018 Eclipse contributors and others.\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +46,143 @@
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-February 1, 2011\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\
-       - 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\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\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.egf.portfolio.emf.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.portfolio.emf.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplatePlugin/about.properties
index f596caa..f6504f4 100644
--- a/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplatePlugin/about.properties
+++ b/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplatePlugin/about.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplatePlugin/build.properties
index 0e50697..da78593 100644
--- a/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplatePlugin/build.properties
+++ b/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplatePlugin/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplatePlugin/plugin.properties
index 4058fa9..88dc3c1 100644
--- a/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.egf.portfolio.emf.feature/sourceTemplatePlugin/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.portfolio.feature/build.properties b/features/org.eclipse.egf.portfolio.feature/build.properties
index 569a10b..d82acb1 100644
--- a/features/org.eclipse.egf.portfolio.feature/build.properties
+++ b/features/org.eclipse.egf.portfolio.feature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,11 +14,11 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-               epl-v10.html,\

+               epl-2.0.html,\

                license.html,\

                eclipse_update_120.jpg,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

 generate.feature@org.eclipse.egf.portfolio.source=org.eclipse.egf.portfolio

diff --git a/features/org.eclipse.egf.portfolio.feature/epl-2.0.html b/features/org.eclipse.egf.portfolio.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.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.egf.portfolio.feature/epl-v10.html b/features/org.eclipse.egf.portfolio.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.portfolio.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.feature/feature.properties b/features/org.eclipse.egf.portfolio.feature/feature.properties
index 49cba12..fa2184b 100644
--- a/features/org.eclipse.egf.portfolio.feature/feature.properties
+++ b/features/org.eclipse.egf.portfolio.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,17 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2018 Eclipse contributors and others.\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +46,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.portfolio.feature/feature.xml b/features/org.eclipse.egf.portfolio.feature/feature.xml
index b0ddbfa..0119f21 100644
--- a/features/org.eclipse.egf.portfolio.feature/feature.xml
+++ b/features/org.eclipse.egf.portfolio.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -22,11 +24,7 @@
    </description>

 

    <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.portfolio.feature/license.html b/features/org.eclipse.egf.portfolio.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.portfolio.feature/license.html
+++ b/features/org.eclipse.egf.portfolio.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.portfolio.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.portfolio.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.feature/rootfiles/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.egf.portfolio.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.portfolio.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.portfolio.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.feature/rootfiles/license.html b/features/org.eclipse.egf.portfolio.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.portfolio.feature/rootfiles/notice.html b/features/org.eclipse.egf.portfolio.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.portfolio.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.egf.portfolio.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.egf.portfolio.feature/sourceTemplateBundle/plugin.properties
index 33431a3..cf92f1c 100644
--- a/features/org.eclipse.egf.portfolio.feature/sourceTemplateBundle/plugin.properties
+++ b/features/org.eclipse.egf.portfolio.feature/sourceTemplateBundle/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.portfolio.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.portfolio.feature/sourceTemplateFeature/build.properties
index ec40e29..d774351 100644
--- a/features/org.eclipse.egf.portfolio.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.portfolio.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -11,7 +14,7 @@
 
 # NLS_MESSAGEFORMAT_VAR
 bin.includes =\
-epl-v10.html,\
+epl-2.0.html,\
 feature.*,\
 eclipse_update_120.jpg,\
 license.html
diff --git a/features/org.eclipse.egf.portfolio.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.portfolio.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.feature/sourceTemplateFeature/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.egf.portfolio.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.portfolio.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2761abd..0000000
--- a/features/org.eclipse.egf.portfolio.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<meta name="ProgId" content="Word.Document">

-<meta name="Generator" content="Microsoft Word 9">

-<meta name="Originator" content="Microsoft Word 9">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.gmf/features/org.eclipse.gmf.sdk-feature/sourceTemplateFeature/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{font-family:Tahoma;

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-generic-font-family:swiss;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	font-family:Tahoma;

-	mso-fareast-font-family:"Times New Roman";}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.portfolio.feature/sourceTemplateFeature/feature.properties
index 2c579da..d8d0eb3 100644
--- a/features/org.eclipse.egf.portfolio.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.portfolio.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,16 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2018 THALES GLOBAL SERVICES\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +45,143 @@
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-February 1, 2011\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\
-       - 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\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\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.egf.portfolio.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.portfolio.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.portfolio.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.portfolio.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.portfolio.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.egf.portfolio.feature/sourceTemplatePlugin/about.properties
index 79e8a03..b15ae9f 100644
--- a/features/org.eclipse.egf.portfolio.feature/sourceTemplatePlugin/about.properties
+++ b/features/org.eclipse.egf.portfolio.feature/sourceTemplatePlugin/about.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.portfolio.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.egf.portfolio.feature/sourceTemplatePlugin/build.properties
index 0e50697..da78593 100644
--- a/features/org.eclipse.egf.portfolio.feature/sourceTemplatePlugin/build.properties
+++ b/features/org.eclipse.egf.portfolio.feature/sourceTemplatePlugin/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.portfolio.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.egf.portfolio.feature/sourceTemplatePlugin/plugin.properties
index 33431a3..cf92f1c 100644
--- a/features/org.eclipse.egf.portfolio.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.egf.portfolio.feature/sourceTemplatePlugin/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties b/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties
index dd1bf22..67f2bea 100644
--- a/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties
+++ b/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,11 +14,11 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-               epl-v10.html,\

+               epl-2.0.html,\

                license.html,\

                eclipse_update_120.jpg,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

 	               
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/epl-2.0.html b/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.genchain.ecoretools.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.egf.portfolio.genchain.ecoretools.feature/epl-v10.html b/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties b/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties
index a909bce..0176104 100644
--- a/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties
+++ b/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,17 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2018 Eclipse contributors and others.\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +46,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.portfolio.genchain.ecoretools.feature/feature.xml b/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.xml
index c5133a8..c7fab8f 100644
--- a/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.xml
+++ b/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -21,11 +23,7 @@
    </description>

 

    <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/license.html b/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/license.html
+++ b/features/org.eclipse.egf.portfolio.genchain.ecoretools.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.portfolio.genchain.ecoretools.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/rootfiles/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.egf.portfolio.genchain.ecoretools.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/rootfiles/license.html b/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.portfolio.genchain.ecoretools.feature/rootfiles/notice.html b/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.portfolio.genchain.ecoretools.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.egf.portfolio.genchain.ecoretools.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/sourceTemplateFeature/build.properties
index 20aacf2..3862f7f 100644
--- a/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,7 +14,7 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-	           epl-v10.html,\

+	           epl-2.0.html,\

 	           license.html,\

                eclipse_update_120.jpg

 	               
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/sourceTemplateFeature/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.egf.portfolio.genchain.ecoretools.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/sourceTemplateFeature/feature.properties
index 62ba08c..0aa72f9 100644
--- a/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,17 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2018 Eclipse contributors and others.\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +46,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.portfolio.genchain.ecoretools.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.portfolio.genchain.feature/build.properties b/features/org.eclipse.egf.portfolio.genchain.feature/build.properties
index 569a10b..d82acb1 100644
--- a/features/org.eclipse.egf.portfolio.genchain.feature/build.properties
+++ b/features/org.eclipse.egf.portfolio.genchain.feature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,11 +14,11 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-               epl-v10.html,\

+               epl-2.0.html,\

                license.html,\

                eclipse_update_120.jpg,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

 generate.feature@org.eclipse.egf.portfolio.source=org.eclipse.egf.portfolio

diff --git a/features/org.eclipse.egf.portfolio.genchain.feature/epl-2.0.html b/features/org.eclipse.egf.portfolio.genchain.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.genchain.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.egf.portfolio.genchain.feature/epl-v10.html b/features/org.eclipse.egf.portfolio.genchain.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.portfolio.genchain.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.genchain.feature/feature.properties b/features/org.eclipse.egf.portfolio.genchain.feature/feature.properties
index 7569fb5..21ad580 100644
--- a/features/org.eclipse.egf.portfolio.genchain.feature/feature.properties
+++ b/features/org.eclipse.egf.portfolio.genchain.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -32,125 +35,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.portfolio.genchain.feature/feature.xml b/features/org.eclipse.egf.portfolio.genchain.feature/feature.xml
index abfc54e..d9b5f1a 100644
--- a/features/org.eclipse.egf.portfolio.genchain.feature/feature.xml
+++ b/features/org.eclipse.egf.portfolio.genchain.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -22,11 +24,7 @@
    </description>

 

    <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.portfolio.genchain.feature/license.html b/features/org.eclipse.egf.portfolio.genchain.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.portfolio.genchain.feature/license.html
+++ b/features/org.eclipse.egf.portfolio.genchain.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.portfolio.genchain.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.portfolio.genchain.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.genchain.feature/rootfiles/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.egf.portfolio.genchain.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.portfolio.genchain.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.portfolio.genchain.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.genchain.feature/rootfiles/license.html b/features/org.eclipse.egf.portfolio.genchain.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.genchain.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.portfolio.genchain.feature/rootfiles/notice.html b/features/org.eclipse.egf.portfolio.genchain.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.portfolio.genchain.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.egf.portfolio.genchain.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplateBundle/plugin.properties
index 1994f99..b7055f9 100644
--- a/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplateBundle/plugin.properties
+++ b/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplateBundle/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplateFeature/build.properties
index ec40e29..d774351 100644
--- a/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -11,7 +14,7 @@
 
 # NLS_MESSAGEFORMAT_VAR
 bin.includes =\
-epl-v10.html,\
+epl-2.0.html,\
 feature.*,\
 eclipse_update_120.jpg,\
 license.html
diff --git a/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplateFeature/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.egf.portfolio.genchain.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2761abd..0000000
--- a/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<meta name="ProgId" content="Word.Document">

-<meta name="Generator" content="Microsoft Word 9">

-<meta name="Originator" content="Microsoft Word 9">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.gmf/features/org.eclipse.gmf.sdk-feature/sourceTemplateFeature/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{font-family:Tahoma;

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-generic-font-family:swiss;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	font-family:Tahoma;

-	mso-fareast-font-family:"Times New Roman";}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplateFeature/feature.properties
index 2151699..644542d 100644
--- a/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -32,125 +35,143 @@
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-February 1, 2011\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\
-       - 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\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\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.egf.portfolio.genchain.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.portfolio.genchain.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplatePlugin/about.properties
index bb6ef69..b5d2135 100644
--- a/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplatePlugin/about.properties
+++ b/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplatePlugin/about.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplatePlugin/build.properties
index 0e50697..da78593 100644
--- a/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplatePlugin/build.properties
+++ b/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplatePlugin/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplatePlugin/plugin.properties
index 1994f99..b7055f9 100644
--- a/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.egf.portfolio.genchain.feature/sourceTemplatePlugin/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.portfolio.task.ant.feature/build.properties b/features/org.eclipse.egf.portfolio.task.ant.feature/build.properties
index 569a10b..d82acb1 100644
--- a/features/org.eclipse.egf.portfolio.task.ant.feature/build.properties
+++ b/features/org.eclipse.egf.portfolio.task.ant.feature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,11 +14,11 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-               epl-v10.html,\

+               epl-2.0.html,\

                license.html,\

                eclipse_update_120.jpg,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

 generate.feature@org.eclipse.egf.portfolio.source=org.eclipse.egf.portfolio

diff --git a/features/org.eclipse.egf.portfolio.task.ant.feature/epl-2.0.html b/features/org.eclipse.egf.portfolio.task.ant.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.task.ant.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.egf.portfolio.task.ant.feature/epl-v10.html b/features/org.eclipse.egf.portfolio.task.ant.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.portfolio.task.ant.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.task.ant.feature/feature.properties b/features/org.eclipse.egf.portfolio.task.ant.feature/feature.properties
index ca13e1d..c5fe8ee 100644
--- a/features/org.eclipse.egf.portfolio.task.ant.feature/feature.properties
+++ b/features/org.eclipse.egf.portfolio.task.ant.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,17 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2018 Eclipse contributors and others.\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +46,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.portfolio.task.ant.feature/feature.xml b/features/org.eclipse.egf.portfolio.task.ant.feature/feature.xml
index ec7f309..ad116c6 100644
--- a/features/org.eclipse.egf.portfolio.task.ant.feature/feature.xml
+++ b/features/org.eclipse.egf.portfolio.task.ant.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -22,11 +24,7 @@
    </description>

 

    <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.portfolio.task.ant.feature/license.html b/features/org.eclipse.egf.portfolio.task.ant.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.portfolio.task.ant.feature/license.html
+++ b/features/org.eclipse.egf.portfolio.task.ant.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.portfolio.task.ant.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.portfolio.task.ant.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.task.ant.feature/rootfiles/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.egf.portfolio.task.ant.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.portfolio.task.ant.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.portfolio.task.ant.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.task.ant.feature/rootfiles/license.html b/features/org.eclipse.egf.portfolio.task.ant.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.task.ant.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.portfolio.task.ant.feature/rootfiles/notice.html b/features/org.eclipse.egf.portfolio.task.ant.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.portfolio.task.ant.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.egf.portfolio.task.ant.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplateBundle/plugin.properties
index b0e17ae..02d8278 100644
--- a/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplateBundle/plugin.properties
+++ b/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplateBundle/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplateFeature/build.properties
index 965b7a7..90cef88 100644
--- a/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,10 +14,10 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-	           epl-v10.html,\

+	           epl-2.0.html,\

 	           license.html,\

                eclipse_update_120.jpg

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

 generate.feature@org.eclipse.egf.portfolio.source=org.eclipse.egf.portfolio

diff --git a/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplateFeature/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.egf.portfolio.task.ant.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2761abd..0000000
--- a/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<meta name="ProgId" content="Word.Document">

-<meta name="Generator" content="Microsoft Word 9">

-<meta name="Originator" content="Microsoft Word 9">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.gmf/features/org.eclipse.gmf.sdk-feature/sourceTemplateFeature/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{font-family:Tahoma;

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-generic-font-family:swiss;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	font-family:Tahoma;

-	mso-fareast-font-family:"Times New Roman";}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplateFeature/feature.properties
index dc264d1..c5fe8ee 100644
--- a/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,17 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2018 Eclipse contributors and others.\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +46,143 @@
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-February 1, 2011\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\
-       - 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\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\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.egf.portfolio.task.ant.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.portfolio.task.ant.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplatePlugin/about.properties
index fcaa3d8..31de697 100644
--- a/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplatePlugin/about.properties
+++ b/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplatePlugin/about.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplatePlugin/build.properties
index 0e50697..da78593 100644
--- a/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplatePlugin/build.properties
+++ b/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplatePlugin/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplatePlugin/plugin.properties
index 1994f99..b7055f9 100644
--- a/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.egf.portfolio.task.ant.feature/sourceTemplatePlugin/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.portfolio.task.ant.test.feature/build.properties b/features/org.eclipse.egf.portfolio.task.ant.test.feature/build.properties
index 965b7a7..90cef88 100644
--- a/features/org.eclipse.egf.portfolio.task.ant.test.feature/build.properties
+++ b/features/org.eclipse.egf.portfolio.task.ant.test.feature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,10 +14,10 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-	           epl-v10.html,\

+	           epl-2.0.html,\

 	           license.html,\

                eclipse_update_120.jpg

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

 generate.feature@org.eclipse.egf.portfolio.source=org.eclipse.egf.portfolio

diff --git a/features/org.eclipse.egf.portfolio.task.ant.test.feature/epl-2.0.html b/features/org.eclipse.egf.portfolio.task.ant.test.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.task.ant.test.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.egf.portfolio.task.ant.test.feature/epl-v10.html b/features/org.eclipse.egf.portfolio.task.ant.test.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.portfolio.task.ant.test.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.task.ant.test.feature/feature.properties b/features/org.eclipse.egf.portfolio.task.ant.test.feature/feature.properties
index b628f27..a4382de 100644
--- a/features/org.eclipse.egf.portfolio.task.ant.test.feature/feature.properties
+++ b/features/org.eclipse.egf.portfolio.task.ant.test.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,16 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2018 THALES GLOBAL SERVICES\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +45,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.portfolio.task.ant.test.feature/feature.xml b/features/org.eclipse.egf.portfolio.task.ant.test.feature/feature.xml
index 56b7f11..1795b52 100644
--- a/features/org.eclipse.egf.portfolio.task.ant.test.feature/feature.xml
+++ b/features/org.eclipse.egf.portfolio.task.ant.test.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -22,11 +24,7 @@
    </description>

 

    <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.portfolio.task.ant.test.feature/license.html b/features/org.eclipse.egf.portfolio.task.ant.test.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.portfolio.task.ant.test.feature/license.html
+++ b/features/org.eclipse.egf.portfolio.task.ant.test.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.portfolio.task.ant.test.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.portfolio.task.ant.test.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.task.ant.test.feature/rootfiles/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.egf.portfolio.task.ant.test.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.portfolio.task.ant.test.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.portfolio.task.ant.test.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.task.ant.test.feature/rootfiles/license.html b/features/org.eclipse.egf.portfolio.task.ant.test.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.task.ant.test.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.portfolio.task.ant.test.feature/rootfiles/notice.html b/features/org.eclipse.egf.portfolio.task.ant.test.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.portfolio.task.ant.test.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.egf.portfolio.task.ant.test.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.portfolio.task.ant.test.feature/sourceTemplateFeature/build.properties
index 20aacf2..3862f7f 100644
--- a/features/org.eclipse.egf.portfolio.task.ant.test.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.portfolio.task.ant.test.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,7 +14,7 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-	           epl-v10.html,\

+	           epl-2.0.html,\

 	           license.html,\

                eclipse_update_120.jpg

 	               
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.task.ant.test.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.portfolio.task.ant.test.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.portfolio.task.ant.test.feature/sourceTemplateFeature/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.egf.portfolio.task.ant.test.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.portfolio.task.ant.test.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.portfolio.task.ant.test.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.portfolio.task.ant.test.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.portfolio.task.ant.test.feature/sourceTemplateFeature/feature.properties
index 26186c7..bb91d6f 100644
--- a/features/org.eclipse.egf.portfolio.task.ant.test.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.portfolio.task.ant.test.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,17 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2018 Eclipse contributors and others.\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +46,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.portfolio.task.ant.test.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.portfolio.task.ant.test.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.portfolio.task.ant.test.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.portfolio.task.ant.test.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.producer.feature/build.properties b/features/org.eclipse.egf.producer.feature/build.properties
index 86f272e..f537b37 100644
--- a/features/org.eclipse.egf.producer.feature/build.properties
+++ b/features/org.eclipse.egf.producer.feature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,11 +14,11 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-               epl-v10.html,\

+               epl-2.0.html,\

                license.html,\

                eclipse_update_120.jpg,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

 generate.feature@org.eclipse.egf.producer.source=org.eclipse.egf.producer

diff --git a/features/org.eclipse.egf.producer.feature/epl-2.0.html b/features/org.eclipse.egf.producer.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.producer.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.egf.producer.feature/epl-v10.html b/features/org.eclipse.egf.producer.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.producer.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.producer.feature/feature.properties b/features/org.eclipse.egf.producer.feature/feature.properties
index 76537cd..0717171 100644
--- a/features/org.eclipse.egf.producer.feature/feature.properties
+++ b/features/org.eclipse.egf.producer.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -32,125 +35,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.producer.feature/feature.xml b/features/org.eclipse.egf.producer.feature/feature.xml
index 7d14b58..18c7b3e 100644
--- a/features/org.eclipse.egf.producer.feature/feature.xml
+++ b/features/org.eclipse.egf.producer.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -23,11 +25,7 @@
     </description>

 

     <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

     </copyright>

 

     <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.producer.feature/license.html b/features/org.eclipse.egf.producer.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.producer.feature/license.html
+++ b/features/org.eclipse.egf.producer.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.producer.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.producer.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.producer.feature/rootfiles/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.egf.producer.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.producer.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.producer.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.producer.feature/rootfiles/license.html b/features/org.eclipse.egf.producer.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.producer.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.producer.feature/rootfiles/notice.html b/features/org.eclipse.egf.producer.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.producer.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.egf.producer.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.egf.producer.feature/sourceTemplateBundle/plugin.properties
index c3ed981..17eade2 100644
--- a/features/org.eclipse.egf.producer.feature/sourceTemplateBundle/plugin.properties
+++ b/features/org.eclipse.egf.producer.feature/sourceTemplateBundle/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.producer.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.producer.feature/sourceTemplateFeature/build.properties
index ec40e29..d774351 100644
--- a/features/org.eclipse.egf.producer.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.producer.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -11,7 +14,7 @@
 
 # NLS_MESSAGEFORMAT_VAR
 bin.includes =\
-epl-v10.html,\
+epl-2.0.html,\
 feature.*,\
 eclipse_update_120.jpg,\
 license.html
diff --git a/features/org.eclipse.egf.producer.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.producer.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.producer.feature/sourceTemplateFeature/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.egf.producer.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.producer.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2761abd..0000000
--- a/features/org.eclipse.egf.producer.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<meta name="ProgId" content="Word.Document">

-<meta name="Generator" content="Microsoft Word 9">

-<meta name="Originator" content="Microsoft Word 9">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.gmf/features/org.eclipse.gmf.sdk-feature/sourceTemplateFeature/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{font-family:Tahoma;

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-generic-font-family:swiss;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	font-family:Tahoma;

-	mso-fareast-font-family:"Times New Roman";}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.producer.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.producer.feature/sourceTemplateFeature/feature.properties
index c0fa18e..b5e6bad 100644
--- a/features/org.eclipse.egf.producer.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.producer.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -32,125 +35,143 @@
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-February 1, 2011\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\
-       - 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\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\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.egf.producer.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.producer.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.producer.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.producer.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.producer.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.egf.producer.feature/sourceTemplatePlugin/about.properties
index a35c047..b35f7d4 100644
--- a/features/org.eclipse.egf.producer.feature/sourceTemplatePlugin/about.properties
+++ b/features/org.eclipse.egf.producer.feature/sourceTemplatePlugin/about.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.producer.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.egf.producer.feature/sourceTemplatePlugin/build.properties
index 0e50697..da78593 100644
--- a/features/org.eclipse.egf.producer.feature/sourceTemplatePlugin/build.properties
+++ b/features/org.eclipse.egf.producer.feature/sourceTemplatePlugin/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.producer.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.egf.producer.feature/sourceTemplatePlugin/plugin.properties
index c3ed981..17eade2 100644
--- a/features/org.eclipse.egf.producer.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.egf.producer.feature/sourceTemplatePlugin/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.producer.ui.feature/build.properties b/features/org.eclipse.egf.producer.ui.feature/build.properties
index 4bfe90c..5cfa160 100644
--- a/features/org.eclipse.egf.producer.ui.feature/build.properties
+++ b/features/org.eclipse.egf.producer.ui.feature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,11 +14,11 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-               epl-v10.html,\

+               epl-2.0.html,\

                license.html,\

                eclipse_update_120.jpg,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

 generate.feature@org.eclipse.egf.producer.ui.source=org.eclipse.egf.producer.ui

diff --git a/features/org.eclipse.egf.producer.ui.feature/epl-2.0.html b/features/org.eclipse.egf.producer.ui.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.producer.ui.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.egf.producer.ui.feature/epl-v10.html b/features/org.eclipse.egf.producer.ui.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.producer.ui.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.producer.ui.feature/feature.properties b/features/org.eclipse.egf.producer.ui.feature/feature.properties
index a276544..f5ba5a8 100644
--- a/features/org.eclipse.egf.producer.ui.feature/feature.properties
+++ b/features/org.eclipse.egf.producer.ui.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,16 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2018 THALES GLOBAL SERVICES\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +45,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.producer.ui.feature/feature.xml b/features/org.eclipse.egf.producer.ui.feature/feature.xml
index 384846e..3c18e08 100644
--- a/features/org.eclipse.egf.producer.ui.feature/feature.xml
+++ b/features/org.eclipse.egf.producer.ui.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -22,11 +24,7 @@
    </description>

 

    <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.producer.ui.feature/license.html b/features/org.eclipse.egf.producer.ui.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.producer.ui.feature/license.html
+++ b/features/org.eclipse.egf.producer.ui.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.producer.ui.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.producer.ui.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.producer.ui.feature/rootfiles/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.egf.producer.ui.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.producer.ui.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.producer.ui.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.producer.ui.feature/rootfiles/license.html b/features/org.eclipse.egf.producer.ui.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.producer.ui.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.producer.ui.feature/rootfiles/notice.html b/features/org.eclipse.egf.producer.ui.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.producer.ui.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.egf.producer.ui.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.egf.producer.ui.feature/sourceTemplateBundle/plugin.properties
index 1109b89..e39622a 100644
--- a/features/org.eclipse.egf.producer.ui.feature/sourceTemplateBundle/plugin.properties
+++ b/features/org.eclipse.egf.producer.ui.feature/sourceTemplateBundle/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.producer.ui.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.producer.ui.feature/sourceTemplateFeature/build.properties
index ec40e29..d774351 100644
--- a/features/org.eclipse.egf.producer.ui.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.producer.ui.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -11,7 +14,7 @@
 
 # NLS_MESSAGEFORMAT_VAR
 bin.includes =\
-epl-v10.html,\
+epl-2.0.html,\
 feature.*,\
 eclipse_update_120.jpg,\
 license.html
diff --git a/features/org.eclipse.egf.producer.ui.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.producer.ui.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.producer.ui.feature/sourceTemplateFeature/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.egf.producer.ui.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.producer.ui.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2761abd..0000000
--- a/features/org.eclipse.egf.producer.ui.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<meta name="ProgId" content="Word.Document">

-<meta name="Generator" content="Microsoft Word 9">

-<meta name="Originator" content="Microsoft Word 9">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.gmf/features/org.eclipse.gmf.sdk-feature/sourceTemplateFeature/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{font-family:Tahoma;

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-generic-font-family:swiss;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	font-family:Tahoma;

-	mso-fareast-font-family:"Times New Roman";}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.producer.ui.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.producer.ui.feature/sourceTemplateFeature/feature.properties
index 87cfc43..af6a885 100644
--- a/features/org.eclipse.egf.producer.ui.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.producer.ui.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -32,125 +35,143 @@
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-February 1, 2011\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\
-       - 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\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\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.egf.producer.ui.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.producer.ui.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.producer.ui.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.producer.ui.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.producer.ui.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.egf.producer.ui.feature/sourceTemplatePlugin/about.properties
index 9e90a6c..bd4352e 100644
--- a/features/org.eclipse.egf.producer.ui.feature/sourceTemplatePlugin/about.properties
+++ b/features/org.eclipse.egf.producer.ui.feature/sourceTemplatePlugin/about.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.producer.ui.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.egf.producer.ui.feature/sourceTemplatePlugin/build.properties
index 0e50697..da78593 100644
--- a/features/org.eclipse.egf.producer.ui.feature/sourceTemplatePlugin/build.properties
+++ b/features/org.eclipse.egf.producer.ui.feature/sourceTemplatePlugin/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.producer.ui.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.egf.producer.ui.feature/sourceTemplatePlugin/plugin.properties
index d5d5efb..e0efeee 100644
--- a/features/org.eclipse.egf.producer.ui.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.egf.producer.ui.feature/sourceTemplatePlugin/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.releng.feature/build.properties b/features/org.eclipse.egf.releng.feature/build.properties
index b1f333f..71061ab 100644
--- a/features/org.eclipse.egf.releng.feature/build.properties
+++ b/features/org.eclipse.egf.releng.feature/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2015 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -12,4 +15,4 @@
 bin.includes = feature.xml,\
                license.html,\
                feature.properties,\
-               epl-v10.html
+               epl-v2.0.html
diff --git a/features/org.eclipse.egf.releng.feature/epl-2.0.html b/features/org.eclipse.egf.releng.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.releng.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.egf.releng.feature/epl-v10.html b/features/org.eclipse.egf.releng.feature/epl-v10.html
deleted file mode 100644
index 8f9c78c..0000000
--- a/features/org.eclipse.egf.releng.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	
-	}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head><body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.releng.feature/feature.properties b/features/org.eclipse.egf.releng.feature/feature.properties
index fac390f..2382a6e 100644
--- a/features/org.eclipse.egf.releng.feature/feature.properties
+++ b/features/org.eclipse.egf.releng.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,17 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2018 Eclipse contributors and others.\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +46,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.releng.feature/feature.xml b/features/org.eclipse.egf.releng.feature/feature.xml
index cc80dff..a9294c0 100644
--- a/features/org.eclipse.egf.releng.feature/feature.xml
+++ b/features/org.eclipse.egf.releng.feature/feature.xml
@@ -10,11 +10,7 @@
    </description>

 

    <copyright>

-      Copyright (c) 2015 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.releng.feature/license.html b/features/org.eclipse.egf.releng.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.releng.feature/license.html
+++ b/features/org.eclipse.egf.releng.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.sdk.feature/build.properties b/features/org.eclipse.egf.sdk.feature/build.properties
index c30d40f..c8d12d0 100644
--- a/features/org.eclipse.egf.sdk.feature/build.properties
+++ b/features/org.eclipse.egf.sdk.feature/build.properties
@@ -1,19 +1,22 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

 ##

 bin.includes = feature.*,\

-               epl-v10.html,\

+               epl-2.0.html,\

                license.html,\

                eclipse_update_120.jpg,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

 

diff --git a/features/org.eclipse.egf.sdk.feature/epl-2.0.html b/features/org.eclipse.egf.sdk.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.sdk.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.egf.sdk.feature/epl-v10.html b/features/org.eclipse.egf.sdk.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.sdk.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.sdk.feature/feature.properties b/features/org.eclipse.egf.sdk.feature/feature.properties
index 668f93b..9fcd086 100644
--- a/features/org.eclipse.egf.sdk.feature/feature.properties
+++ b/features/org.eclipse.egf.sdk.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -32,125 +35,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.sdk.feature/feature.xml b/features/org.eclipse.egf.sdk.feature/feature.xml
index 61a0784..42bd824 100644
--- a/features/org.eclipse.egf.sdk.feature/feature.xml
+++ b/features/org.eclipse.egf.sdk.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -21,11 +23,7 @@
    </description>

 

    <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.sdk.feature/license.html b/features/org.eclipse.egf.sdk.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.sdk.feature/license.html
+++ b/features/org.eclipse.egf.sdk.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.sdk.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.sdk.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.sdk.feature/rootfiles/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.egf.sdk.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.sdk.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.sdk.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.sdk.feature/rootfiles/license.html b/features/org.eclipse.egf.sdk.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.sdk.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.sdk.feature/rootfiles/notice.html b/features/org.eclipse.egf.sdk.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.sdk.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.egf.sdk.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.sdk.feature/sourceTemplateFeature/build.properties
index ad0cac6..92b3d94 100644
--- a/features/org.eclipse.egf.sdk.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.sdk.feature/sourceTemplateFeature/build.properties
@@ -1,15 +1,18 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

 ##

 bin.includes = feature.*,\

-			   epl-v10.html,\

+			   epl-2.0.html,\

 	           license.html,\

                eclipse_update_120.jpg

 

diff --git a/features/org.eclipse.egf.sdk.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.sdk.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.sdk.feature/sourceTemplateFeature/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.egf.sdk.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.sdk.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.sdk.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.sdk.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.sdk.feature/sourceTemplateFeature/feature.properties
index d22fcfc..1a737a2 100644
--- a/features/org.eclipse.egf.sdk.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.sdk.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,17 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2018 Eclipse contributors and others.\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +46,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.sdk.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.sdk.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.sdk.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.sdk.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.test.feature/build.properties b/features/org.eclipse.egf.test.feature/build.properties
index a773853..be3f0a6 100644
--- a/features/org.eclipse.egf.test.feature/build.properties
+++ b/features/org.eclipse.egf.test.feature/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

@@ -11,11 +14,11 @@
 

 # NLS_MESSAGEFORMAT_VAR

 bin.includes = feature.*,\

-               epl-v10.html,\

+               epl-2.0.html,\

                license.html,\

                eclipse_update_120.jpg,\

                feature.properties

-src.includes = epl-v10.html,\

+src.includes = epl-2.0.html,\

                license.html

 root=rootfiles

 generate.feature@org.eclipse.egf.test.source=org.eclipse.egf.test

diff --git a/features/org.eclipse.egf.test.feature/epl-2.0.html b/features/org.eclipse.egf.test.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.test.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.egf.test.feature/epl-v10.html b/features/org.eclipse.egf.test.feature/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.test.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.test.feature/feature.properties b/features/org.eclipse.egf.test.feature/feature.properties
index a512f7a..53f2da3 100644
--- a/features/org.eclipse.egf.test.feature/feature.properties
+++ b/features/org.eclipse.egf.test.feature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -24,6 +27,17 @@
 EMFUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
 EMFTUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2018 Eclipse contributors and others.\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -32,125 +46,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\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  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\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- 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\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- 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\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   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.egf.test.feature/feature.xml b/features/org.eclipse.egf.test.feature/feature.xml
index f7b94e6..812a0c9 100644
--- a/features/org.eclipse.egf.test.feature/feature.xml
+++ b/features/org.eclipse.egf.test.feature/feature.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

@@ -22,11 +24,7 @@
    </description>

 

    <copyright>

-      Copyright (c) 2009, 2018 THALES GLOBAL SERVICES
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html

+	%copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.test.feature/license.html b/features/org.eclipse.egf.test.feature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.test.feature/license.html
+++ b/features/org.eclipse.egf.test.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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.test.feature/rootfiles/epl-2.0.html b/features/org.eclipse.egf.test.feature/rootfiles/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.test.feature/rootfiles/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.egf.test.feature/rootfiles/epl-v10.html b/features/org.eclipse.egf.test.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 2a2421c..0000000
--- a/features/org.eclipse.egf.test.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>

-

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	

-	}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.test.feature/rootfiles/license.html b/features/org.eclipse.egf.test.feature/rootfiles/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/features/org.eclipse.egf.test.feature/rootfiles/license.html
@@ -0,0 +1,189 @@
+<?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>November 22, 2017</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 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>
+
+	<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 Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.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>
+
+
+	<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.egf.test.feature/rootfiles/notice.html b/features/org.eclipse.egf.test.feature/rootfiles/notice.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.egf.test.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.egf.test.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.egf.test.feature/sourceTemplateBundle/plugin.properties
index 3a76cd4..259b0e4 100644
--- a/features/org.eclipse.egf.test.feature/sourceTemplateBundle/plugin.properties
+++ b/features/org.eclipse.egf.test.feature/sourceTemplateBundle/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.test.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.egf.test.feature/sourceTemplateFeature/build.properties
index ec40e29..d774351 100644
--- a/features/org.eclipse.egf.test.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.egf.test.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -11,7 +14,7 @@
 
 # NLS_MESSAGEFORMAT_VAR
 bin.includes =\
-epl-v10.html,\
+epl-2.0.html,\
 feature.*,\
 eclipse_update_120.jpg,\
 license.html
diff --git a/features/org.eclipse.egf.test.feature/sourceTemplateFeature/epl-2.0.html b/features/org.eclipse.egf.test.feature/sourceTemplateFeature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.egf.test.feature/sourceTemplateFeature/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.egf.test.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.egf.test.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 2761abd..0000000
--- a/features/org.eclipse.egf.test.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>

-

-

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<meta name="ProgId" content="Word.Document">

-<meta name="Generator" content="Microsoft Word 9">

-<meta name="Originator" content="Microsoft Word 9">

-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.gmf/features/org.eclipse.gmf.sdk-feature/sourceTemplateFeature/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{font-family:Tahoma;

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-generic-font-family:swiss;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	font-family:Tahoma;

-	mso-fareast-font-family:"Times New Roman";}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head><body style="" lang="EN-US">

-

-<div class="Section1">

-

-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>

-

-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear="left">

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-changes to the Program, and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-additions to the Program;</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Contributor" means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style="font-size: 10pt;">"Program" means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style="font-size: 10pt;">"Recipient" means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>

-

-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)

-its license agreement:</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>

-

-<p><span style="font-size: 10pt;">When the Program is made available in source

-code form:</span> </p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)

-it must be made available under this Agreement; and </span></p>

-

-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style="font-size: 10pt;">Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style="font-size: 10pt;">For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>

-

-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>

-

-</div>

-

-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.egf.test.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.egf.test.feature/sourceTemplateFeature/feature.properties
index 4437af2..5eba67a 100644
--- a/features/org.eclipse.egf.test.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.egf.test.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
@@ -28,129 +31,157 @@
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
 
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2018 THALES GLOBAL SERVICES\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n
 # "license" property - text of the "Feature Update License"
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-February 1, 2011\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\
-       - 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\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\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.egf.test.feature/sourceTemplateFeature/license.html b/features/org.eclipse.egf.test.feature/sourceTemplateFeature/license.html
index c3d34c3..008b801 100644
--- a/features/org.eclipse.egf.test.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.egf.test.feature/sourceTemplateFeature/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-v10.html">http://www.eclipse.org/legal/epl-v10.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.egf.test.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.egf.test.feature/sourceTemplatePlugin/about.properties
index e5d1ed3..e5b3866 100644
--- a/features/org.eclipse.egf.test.feature/sourceTemplatePlugin/about.properties
+++ b/features/org.eclipse.egf.test.feature/sourceTemplatePlugin/about.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.test.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.egf.test.feature/sourceTemplatePlugin/build.properties
index 0e50697..da78593 100644
--- a/features/org.eclipse.egf.test.feature/sourceTemplatePlugin/build.properties
+++ b/features/org.eclipse.egf.test.feature/sourceTemplatePlugin/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/org.eclipse.egf.test.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.egf.test.feature/sourceTemplatePlugin/plugin.properties
index 3a76cd4..259b0e4 100644
--- a/features/org.eclipse.egf.test.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.egf.test.feature/sourceTemplatePlugin/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/features/pom.xml b/features/pom.xml
index 733dc99..8cd06cf 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2018 THALES GLOBAL SERVICES.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
   which accompanies this distribution, and is available at
-  http://www.eclipse.org/legal/epl-v10.html
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 
   Contributors:
        Thales - initial API and implementation
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/build.properties b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/build.properties
index c0f53db..e1caa55 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/build.properties
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/plugin.xml b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/plugin.xml
index 9468fb4..e7336fa 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/plugin.xml
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License 2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0/

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/platform_specific/oxygen/org.eclipse.egf.emf.pattern/build.properties b/platform_specific/oxygen/org.eclipse.egf.emf.pattern/build.properties
index c0f53db..e1caa55 100644
--- a/platform_specific/oxygen/org.eclipse.egf.emf.pattern/build.properties
+++ b/platform_specific/oxygen/org.eclipse.egf.emf.pattern/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/platform_specific/oxygen/org.eclipse.egf.emf.pattern/plugin.properties b/platform_specific/oxygen/org.eclipse.egf.emf.pattern/plugin.properties
index 32e2798..057a9ba 100644
--- a/platform_specific/oxygen/org.eclipse.egf.emf.pattern/plugin.properties
+++ b/platform_specific/oxygen/org.eclipse.egf.emf.pattern/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/platform_specific/oxygen/org.eclipse.egf.emf.pattern/plugin.xml b/platform_specific/oxygen/org.eclipse.egf.emf.pattern/plugin.xml
index 9468fb4..2fced3b 100644
--- a/platform_specific/oxygen/org.eclipse.egf.emf.pattern/plugin.xml
+++ b/platform_specific/oxygen/org.eclipse.egf.emf.pattern/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/platform_specific/oxygen/pom.xml b/platform_specific/oxygen/pom.xml
index 6b3c900..1b44b57 100644
--- a/platform_specific/oxygen/pom.xml
+++ b/platform_specific/oxygen/pom.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2018 THALES GLOBAL SERVICES.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
   which accompanies this distribution, and is available at
-  http://www.eclipse.org/legal/epl-v10.html
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 
   Contributors:
        Thales - initial API and implementation
diff --git a/platform_specific/photon/org.eclipse.egf.emf.pattern/build.properties b/platform_specific/photon/org.eclipse.egf.emf.pattern/build.properties
index c0f53db..e1caa55 100644
--- a/platform_specific/photon/org.eclipse.egf.emf.pattern/build.properties
+++ b/platform_specific/photon/org.eclipse.egf.emf.pattern/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/platform_specific/photon/org.eclipse.egf.emf.pattern/plugin.properties b/platform_specific/photon/org.eclipse.egf.emf.pattern/plugin.properties
index 3747c7c..c8b055e 100644
--- a/platform_specific/photon/org.eclipse.egf.emf.pattern/plugin.properties
+++ b/platform_specific/photon/org.eclipse.egf.emf.pattern/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/platform_specific/photon/org.eclipse.egf.emf.pattern/plugin.xml b/platform_specific/photon/org.eclipse.egf.emf.pattern/plugin.xml
index 9468fb4..2fced3b 100644
--- a/platform_specific/photon/org.eclipse.egf.emf.pattern/plugin.xml
+++ b/platform_specific/photon/org.eclipse.egf.emf.pattern/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/platform_specific/photon/pom.xml b/platform_specific/photon/pom.xml
index 0d9968b..23d3a7e 100644
--- a/platform_specific/photon/pom.xml
+++ b/platform_specific/photon/pom.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2018 THALES GLOBAL SERVICES.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
   which accompanies this distribution, and is available at
-  http://www.eclipse.org/legal/epl-v10.html
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 
   Contributors:
        Thales - initial API and implementation
diff --git a/plugins/org.eclipse.egf.application/ant_tasks/egf.ant.tasks.jar b/plugins/org.eclipse.egf.application/ant_tasks/egf.ant.tasks.jar
index e69de29..6364e16 100644
--- a/plugins/org.eclipse.egf.application/ant_tasks/egf.ant.tasks.jar
+++ b/plugins/org.eclipse.egf.application/ant_tasks/egf.ant.tasks.jar
Binary files differ
diff --git a/plugins/org.eclipse.egf.application/build.properties b/plugins/org.eclipse.egf.application/build.properties
index 04a9275..42043b0 100644
--- a/plugins/org.eclipse.egf.application/build.properties
+++ b/plugins/org.eclipse.egf.application/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.application/plugin.properties b/plugins/org.eclipse.egf.application/plugin.properties
index dcb70c4..dc75e81 100644
--- a/plugins/org.eclipse.egf.application/plugin.properties
+++ b/plugins/org.eclipse.egf.application/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.application/plugin.xml b/plugins/org.eclipse.egf.application/plugin.xml
index 4fcef4e..af0f7fd 100644
--- a/plugins/org.eclipse.egf.application/plugin.xml
+++ b/plugins/org.eclipse.egf.application/plugin.xml
Binary files differ
diff --git a/plugins/org.eclipse.egf.application/src/org/eclipse/egf/application/activity/ActivityApplication.java b/plugins/org.eclipse.egf.application/src/org/eclipse/egf/application/activity/ActivityApplication.java
index c6ad2aa..2d436e1 100644
--- a/plugins/org.eclipse.egf.application/src/org/eclipse/egf/application/activity/ActivityApplication.java
+++ b/plugins/org.eclipse.egf.application/src/org/eclipse/egf/application/activity/ActivityApplication.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.application/src/org/eclipse/egf/application/activity/IApplicationConfigurationConstants.java b/plugins/org.eclipse.egf.application/src/org/eclipse/egf/application/activity/IApplicationConfigurationConstants.java
index 07c7e61..2b5c348 100644
--- a/plugins/org.eclipse.egf.application/src/org/eclipse/egf/application/activity/IApplicationConfigurationConstants.java
+++ b/plugins/org.eclipse.egf.application/src/org/eclipse/egf/application/activity/IApplicationConfigurationConstants.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.application/src/org/eclipse/egf/application/internal/activity/ActivityRunner.java b/plugins/org.eclipse.egf.application/src/org/eclipse/egf/application/internal/activity/ActivityRunner.java
index 3708178..285b7ad 100644
--- a/plugins/org.eclipse.egf.application/src/org/eclipse/egf/application/internal/activity/ActivityRunner.java
+++ b/plugins/org.eclipse.egf.application/src/org/eclipse/egf/application/internal/activity/ActivityRunner.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.application/src/org/eclipse/egf/application/internal/l10n/ApplicationMessages.java b/plugins/org.eclipse.egf.application/src/org/eclipse/egf/application/internal/l10n/ApplicationMessages.java
index 760c324..c26f1f7 100644
--- a/plugins/org.eclipse.egf.application/src/org/eclipse/egf/application/internal/l10n/ApplicationMessages.java
+++ b/plugins/org.eclipse.egf.application/src/org/eclipse/egf/application/internal/l10n/ApplicationMessages.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.application/src/org/eclipse/egf/application/internal/l10n/messages.properties b/plugins/org.eclipse.egf.application/src/org/eclipse/egf/application/internal/l10n/messages.properties
index 8945e35..9f645db 100644
--- a/plugins/org.eclipse.egf.application/src/org/eclipse/egf/application/internal/l10n/messages.properties
+++ b/plugins/org.eclipse.egf.application/src/org/eclipse/egf/application/internal/l10n/messages.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.application/tasks/org/eclipse/egf/ant/taskdefs/EGFTask.java b/plugins/org.eclipse.egf.application/tasks/org/eclipse/egf/ant/taskdefs/EGFTask.java
index 6a06b4e..495002d 100644
--- a/plugins/org.eclipse.egf.application/tasks/org/eclipse/egf/ant/taskdefs/EGFTask.java
+++ b/plugins/org.eclipse.egf.application/tasks/org/eclipse/egf/ant/taskdefs/EGFTask.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * 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

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM - Initial API and implementation

diff --git a/plugins/org.eclipse.egf.application/tasks/org/eclipse/egf/ant/taskdefs/NestedElement.java b/plugins/org.eclipse.egf.application/tasks/org/eclipse/egf/ant/taskdefs/NestedElement.java
index cacd0ae..45e8ced 100644
--- a/plugins/org.eclipse.egf.application/tasks/org/eclipse/egf/ant/taskdefs/NestedElement.java
+++ b/plugins/org.eclipse.egf.application/tasks/org/eclipse/egf/ant/taskdefs/NestedElement.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.application/tasks/org/eclipse/egf/ant/taskdefs/activity/ActivityTask.java b/plugins/org.eclipse.egf.application/tasks/org/eclipse/egf/ant/taskdefs/activity/ActivityTask.java
index 58e7780..c407852 100644
--- a/plugins/org.eclipse.egf.application/tasks/org/eclipse/egf/ant/taskdefs/activity/ActivityTask.java
+++ b/plugins/org.eclipse.egf.application/tasks/org/eclipse/egf/ant/taskdefs/activity/ActivityTask.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * 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
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.egf.application/tasks/org/eclipse/egf/ant/taskdefs/activity/NestedActivity.java b/plugins/org.eclipse.egf.application/tasks/org/eclipse/egf/ant/taskdefs/activity/NestedActivity.java
index 0279039..7b60864 100644
--- a/plugins/org.eclipse.egf.application/tasks/org/eclipse/egf/ant/taskdefs/activity/NestedActivity.java
+++ b/plugins/org.eclipse.egf.application/tasks/org/eclipse/egf/ant/taskdefs/activity/NestedActivity.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common.ui/build.properties b/plugins/org.eclipse.egf.common.ui/build.properties
index 0772c9e..8a7debd 100644
--- a/plugins/org.eclipse.egf.common.ui/build.properties
+++ b/plugins/org.eclipse.egf.common.ui/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009, 2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common.ui/plugin.properties b/plugins/org.eclipse.egf.common.ui/plugin.properties
index 17cd4e2..f3fdaba 100644
--- a/plugins/org.eclipse.egf.common.ui/plugin.properties
+++ b/plugins/org.eclipse.egf.common.ui/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/EGFCommonUIPlugin.java b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/EGFCommonUIPlugin.java
index e77b7d6..99fdb8a 100644
--- a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/EGFCommonUIPlugin.java
+++ b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/EGFCommonUIPlugin.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/ICommonUIImages.java b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/ICommonUIImages.java
index 0398aee..c5de399 100644
--- a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/ICommonUIImages.java
+++ b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/ICommonUIImages.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2007-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/actions/CopyEObjectMetaClassQualifiedNameAction.java b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/actions/CopyEObjectMetaClassQualifiedNameAction.java
index 1eb53fd..7957406 100644
--- a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/actions/CopyEObjectMetaClassQualifiedNameAction.java
+++ b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/actions/CopyEObjectMetaClassQualifiedNameAction.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2007-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/actions/CopyEObjectQualifiedNameAction.java b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/actions/CopyEObjectQualifiedNameAction.java
index d5f421d..b13e4c6 100644
--- a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/actions/CopyEObjectQualifiedNameAction.java
+++ b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/actions/CopyEObjectQualifiedNameAction.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2007-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/actions/CopyEObjectStaticMetaClassQualifiedNameAction.java b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/actions/CopyEObjectStaticMetaClassQualifiedNameAction.java
index 33df2fa..a5af67a 100644
--- a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/actions/CopyEObjectStaticMetaClassQualifiedNameAction.java
+++ b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/actions/CopyEObjectStaticMetaClassQualifiedNameAction.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2007-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/actions/CopyQualifiedNameAction.java b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/actions/CopyQualifiedNameAction.java
index 441e582..6237ba6 100644
--- a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/actions/CopyQualifiedNameAction.java
+++ b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/actions/CopyQualifiedNameAction.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/activator/EGFAbstractUIPlugin.java b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/activator/EGFAbstractUIPlugin.java
index ea0a892..184b827 100644
--- a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/activator/EGFAbstractUIPlugin.java
+++ b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/activator/EGFAbstractUIPlugin.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/activator/EGFEclipseUIPlugin.java b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/activator/EGFEclipseUIPlugin.java
index d9d78a5..d043642 100644
--- a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/activator/EGFEclipseUIPlugin.java
+++ b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/activator/EGFEclipseUIPlugin.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/constant/EGFCommonUIConstants.java b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/constant/EGFCommonUIConstants.java
index cf5b20d..9895d5a 100644
--- a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/constant/EGFCommonUIConstants.java
+++ b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/constant/EGFCommonUIConstants.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/fields/BooleanFieldEditor2.java b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/fields/BooleanFieldEditor2.java
index f51b182..b673c9e 100644
--- a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/fields/BooleanFieldEditor2.java
+++ b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/fields/BooleanFieldEditor2.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2000, 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

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/fields/RadioGroupFieldEditor2.java b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/fields/RadioGroupFieldEditor2.java
index 9f067ad..80f4094 100644
--- a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/fields/RadioGroupFieldEditor2.java
+++ b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/fields/RadioGroupFieldEditor2.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2000, 2006 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/helper/EditorHelper.java b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/helper/EditorHelper.java
index 5ddbb27..5e4c99f 100644
--- a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/helper/EditorHelper.java
+++ b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/helper/EditorHelper.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2000, 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

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/helper/ThrowableHandler.java b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/helper/ThrowableHandler.java
index 91139e6..4a26f77 100644
--- a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/helper/ThrowableHandler.java
+++ b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/helper/ThrowableHandler.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/l10n/EGFCommonUIMessages.java b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/l10n/EGFCommonUIMessages.java
index c0705d0..802cc05 100644
--- a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/l10n/EGFCommonUIMessages.java
+++ b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/l10n/EGFCommonUIMessages.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/l10n/messages.properties b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/l10n/messages.properties
index 03e9d06..e918551 100644
--- a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/l10n/messages.properties
+++ b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/l10n/messages.properties
@@ -1,9 +1,12 @@
 ##

-# Copyright (c) 2000, 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

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+#  Copyright (c) 2000, 2009 IBM Corporation and others.

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 ##

 

diff --git a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/wizard/AllZipsBundleExampleWizard.java b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/wizard/AllZipsBundleExampleWizard.java
index 856d989..914ef64 100644
--- a/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/wizard/AllZipsBundleExampleWizard.java
+++ b/plugins/org.eclipse.egf.common.ui/src/org/eclipse/egf/common/ui/wizard/AllZipsBundleExampleWizard.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common/build.properties b/plugins/org.eclipse.egf.common/build.properties
index 4e00841..f03c470 100644
--- a/plugins/org.eclipse.egf.common/build.properties
+++ b/plugins/org.eclipse.egf.common/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common/plugin.properties b/plugins/org.eclipse.egf.common/plugin.properties
index 14e0b4a..f5f6aad 100644
--- a/plugins/org.eclipse.egf.common/plugin.properties
+++ b/plugins/org.eclipse.egf.common/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common/plugin.xml b/plugins/org.eclipse.egf.common/plugin.xml
index 4b262e2..ed41ac7 100644
--- a/plugins/org.eclipse.egf.common/plugin.xml
+++ b/plugins/org.eclipse.egf.common/plugin.xml
Binary files differ
diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/EGFCommonPlugin.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/EGFCommonPlugin.java
index 457b1bd..296a0c4 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/EGFCommonPlugin.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/EGFCommonPlugin.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/activator/EGFAbstractPlugin.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/activator/EGFAbstractPlugin.java
index 062888c..0f6e7de 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/activator/EGFAbstractPlugin.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/activator/EGFAbstractPlugin.java
@@ -1,10 +1,12 @@
 /**
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/activator/EGFEclipsePlugin.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/activator/EGFEclipsePlugin.java
index 0400897..0e23d77 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/activator/EGFEclipsePlugin.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/activator/EGFEclipsePlugin.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/constant/EGFCommonConstants.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/constant/EGFCommonConstants.java
index b911a24..e7008bd 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/constant/EGFCommonConstants.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/constant/EGFCommonConstants.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/cycle/AbstractBrentCycleDetection.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/cycle/AbstractBrentCycleDetection.java
index 396c0b9..769b047 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/cycle/AbstractBrentCycleDetection.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/cycle/AbstractBrentCycleDetection.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/cycle/AbstractCycleDetection.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/cycle/AbstractCycleDetection.java
index ae9ba10..7676dee 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/cycle/AbstractCycleDetection.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/cycle/AbstractCycleDetection.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/cycle/AbstractFloydCycleDetection.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/cycle/AbstractFloydCycleDetection.java
index 1fdea13..fa3065a 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/cycle/AbstractFloydCycleDetection.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/cycle/AbstractFloydCycleDetection.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/generator/EGFJMerger.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/generator/EGFJMerger.java
index cc96fb0..f59cea5 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/generator/EGFJMerger.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/generator/EGFJMerger.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2006-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

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM - Initial API and implementation

diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/generator/IEgfGeneratorConstants.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/generator/IEgfGeneratorConstants.java
index d27f79a..b18a9d1 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/generator/IEgfGeneratorConstants.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/generator/IEgfGeneratorConstants.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/BundleHelper.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/BundleHelper.java
index ea90383..9265159 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/BundleHelper.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/BundleHelper.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/ClassHelper.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/ClassHelper.java
index 9c0263a..438ada9 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/ClassHelper.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/ClassHelper.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/CollectionHelper.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/CollectionHelper.java
index 4caf9c2..51caf86 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/CollectionHelper.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/CollectionHelper.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/EMFHelper.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/EMFHelper.java
index 536db08..9074234 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/EMFHelper.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/EMFHelper.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/FileHelper.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/FileHelper.java
index 0e47d6b..1317e32 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/FileHelper.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/FileHelper.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/JavaHelper.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/JavaHelper.java
index cb223db..760e2f9 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/JavaHelper.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/JavaHelper.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S and others

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/ObjectHolder.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/ObjectHolder.java
index 9be3c84..fb0ca79 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/ObjectHolder.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/ObjectHolder.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/ProjectHelper.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/ProjectHelper.java
index e1736e0..19d4bec 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/ProjectHelper.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/ProjectHelper.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/StatusHelper.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/StatusHelper.java
index 6a88173..2aa2de4 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/StatusHelper.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/StatusHelper.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/StringHelper.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/StringHelper.java
index 79ebc3a..ff2c797 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/StringHelper.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/StringHelper.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/URIHelper.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/URIHelper.java
index 1ee9b25..8923a6c 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/URIHelper.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/helper/URIHelper.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/internal/registry/EGFLoggerProxy.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/internal/registry/EGFLoggerProxy.java
index 9237102..583c19d 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/internal/registry/EGFLoggerProxy.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/internal/registry/EGFLoggerProxy.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/internal/registry/EGFLoggerRegistry.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/internal/registry/EGFLoggerRegistry.java
index fd9c2c8..4f383ce 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/internal/registry/EGFLoggerRegistry.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/internal/registry/EGFLoggerRegistry.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/l10n/EGFCommonMessages.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/l10n/EGFCommonMessages.java
index 90b55bb..e02e37e 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/l10n/EGFCommonMessages.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/l10n/EGFCommonMessages.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/l10n/messages.properties b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/l10n/messages.properties
index 3cf9409..e855440 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/l10n/messages.properties
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/l10n/messages.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/loader/IClassLoader.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/loader/IClassLoader.java
index 08bf307..77700fb 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/loader/IClassLoader.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/loader/IClassLoader.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/loader/JavaClassLoaderFactory.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/loader/JavaClassLoaderFactory.java
index eabfb93..4c158e0 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/loader/JavaClassLoaderFactory.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/loader/JavaClassLoaderFactory.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Soyatec.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Soyatec - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/log/IEGFLogger.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/log/IEGFLogger.java
index c081628..8c6af6b 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/log/IEGFLogger.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/log/IEGFLogger.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/log/IEGFLoggerFactory.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/log/IEGFLoggerFactory.java
index 34989a2..e1dc376 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/log/IEGFLoggerFactory.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/log/IEGFLoggerFactory.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/log/IEGFLoggerRegistry.java b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/log/IEGFLoggerRegistry.java
index aa1b5ec..f85aa20 100644
--- a/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/log/IEGFLoggerRegistry.java
+++ b/plugins/org.eclipse.egf.common/src/org/eclipse/egf/common/log/IEGFLoggerRegistry.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.console/build.properties b/plugins/org.eclipse.egf.console/build.properties
index ac558c2..a48860d 100644
--- a/plugins/org.eclipse.egf.console/build.properties
+++ b/plugins/org.eclipse.egf.console/build.properties
@@ -1,9 +1,12 @@
 ##

-# Copyright (c) 2000, 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

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+#  Copyright (c) 2000, 2009 IBM Corporation and others.

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 # Contributors:

 #     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.egf.console/plugin.properties b/plugins/org.eclipse.egf.console/plugin.properties
index 4351067..f951fb8 100644
--- a/plugins/org.eclipse.egf.console/plugin.properties
+++ b/plugins/org.eclipse.egf.console/plugin.properties
@@ -1,9 +1,12 @@
 ##

-# Copyright (c) 2000, 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

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+#  Copyright (c) 2000, 2009 IBM Corporation and others.

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 # Contributors:

 #     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/EGFConsolePlugin.java b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/EGFConsolePlugin.java
index 31dd928..909f457 100644
--- a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/EGFConsolePlugin.java
+++ b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/EGFConsolePlugin.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2000, 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

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ColorManager.java b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ColorManager.java
index c27b459..2278d39 100644
--- a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ColorManager.java
+++ b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ColorManager.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2000, 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
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/Console.java b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/Console.java
index 066f037..8d8965c 100644
--- a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/Console.java
+++ b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/Console.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2000, 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
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ConsoleDocument.java b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ConsoleDocument.java
index 1fb257e..d07d759 100644
--- a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ConsoleDocument.java
+++ b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ConsoleDocument.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2000, 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
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ConsoleFactory.java b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ConsoleFactory.java
index 5545194..ff8b573 100644
--- a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ConsoleFactory.java
+++ b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ConsoleFactory.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2000, 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
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ConsoleLineNotifier.java b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ConsoleLineNotifier.java
index cdeeb78..3e8085d 100644
--- a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ConsoleLineNotifier.java
+++ b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ConsoleLineNotifier.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2000, 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
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ConsolePageParticipant.java b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ConsolePageParticipant.java
index 1b56c83..20ddce1 100644
--- a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ConsolePageParticipant.java
+++ b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ConsolePageParticipant.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2000, 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
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ConsolePreferenceInitializer.java b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ConsolePreferenceInitializer.java
index 27b3930..b02599e 100644
--- a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ConsolePreferenceInitializer.java
+++ b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ConsolePreferenceInitializer.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2000, 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
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ConsoleRemoveAction.java b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ConsoleRemoveAction.java
index 8da1da7..d872a7e 100644
--- a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ConsoleRemoveAction.java
+++ b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/ConsoleRemoveAction.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2000, 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
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/EGFLoggerFactory.java b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/EGFLoggerFactory.java
index 8ff453b..770c882 100644
--- a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/EGFLoggerFactory.java
+++ b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/EGFLoggerFactory.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/IEGFConsoleConstants.java b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/IEGFConsoleConstants.java
index 5169507..715450c 100644
--- a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/IEGFConsoleConstants.java
+++ b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/internal/IEGFConsoleConstants.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2000, 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
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/l10n/ConsoleMessages.java b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/l10n/ConsoleMessages.java
index fa87941..4e9400f 100644
--- a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/l10n/ConsoleMessages.java
+++ b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/l10n/ConsoleMessages.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2000, 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

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/l10n/messages.properties b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/l10n/messages.properties
index 9734bdf..8b2bc1c 100644
--- a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/l10n/messages.properties
+++ b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/l10n/messages.properties
@@ -1,9 +1,12 @@
 ##

-# Copyright (c) 2000, 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

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+#  Copyright (c) 2000, 2009 IBM Corporation and others.

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 # Contributors:

 #     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/preferences/EGFPreferencePage.java b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/preferences/EGFPreferencePage.java
index 1f9ff30..18c8d96 100644
--- a/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/preferences/EGFPreferencePage.java
+++ b/plugins/org.eclipse.egf.console/src/org/eclipse/egf/console/preferences/EGFPreferencePage.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.egf.core.pde/.classpath b/plugins/org.eclipse.egf.core.pde/.classpath
index fd25fd7..2d1a430 100644
--- a/plugins/org.eclipse.egf.core.pde/.classpath
+++ b/plugins/org.eclipse.egf.core.pde/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="src" path="src"/>

 	<classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/plugins/org.eclipse.egf.core.pde/build.properties b/plugins/org.eclipse.egf.core.pde/build.properties
index c9848de..50cb85c 100644
--- a/plugins/org.eclipse.egf.core.pde/build.properties
+++ b/plugins/org.eclipse.egf.core.pde/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.pde/plugin.properties b/plugins/org.eclipse.egf.core.pde/plugin.properties
index 334dbde..a981ede 100644
--- a/plugins/org.eclipse.egf.core.pde/plugin.properties
+++ b/plugins/org.eclipse.egf.core.pde/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/EGFPDEPlugin.java b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/EGFPDEPlugin.java
index 7212669..9e825ad 100644
--- a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/EGFPDEPlugin.java
+++ b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/EGFPDEPlugin.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/extension/IFcoreExtensionFactory.java b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/extension/IFcoreExtensionFactory.java
index 25c312c..d752a9a 100644
--- a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/extension/IFcoreExtensionFactory.java
+++ b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/extension/IFcoreExtensionFactory.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/helper/ExtensionHelper.java b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/helper/ExtensionHelper.java
index 51e0417..9dd5640 100644
--- a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/helper/ExtensionHelper.java
+++ b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/helper/ExtensionHelper.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/helper/PluginHelper.java b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/helper/PluginHelper.java
index c2ee9cf..0d7294d 100644
--- a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/helper/PluginHelper.java
+++ b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/helper/PluginHelper.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/FcoreGeneratorHelper.java b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/FcoreGeneratorHelper.java
index 0fa355f..6cbd547 100644
--- a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/FcoreGeneratorHelper.java
+++ b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/FcoreGeneratorHelper.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/extension/AbstractFcoreExtensionCommand.java b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/extension/AbstractFcoreExtensionCommand.java
index 1039421..a38d025 100644
--- a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/extension/AbstractFcoreExtensionCommand.java
+++ b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/extension/AbstractFcoreExtensionCommand.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/extension/FcoreExtensionFactory.java b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/extension/FcoreExtensionFactory.java
index 67917b0..8581360 100644
--- a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/extension/FcoreExtensionFactory.java
+++ b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/extension/FcoreExtensionFactory.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/extension/SetFcoreExtensionCommand.java b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/extension/SetFcoreExtensionCommand.java
index 2ee589c..f065cc3 100644
--- a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/extension/SetFcoreExtensionCommand.java
+++ b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/extension/SetFcoreExtensionCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/extension/UnsetFcoreExtensionCommand.java b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/extension/UnsetFcoreExtensionCommand.java
index 9f751ac..54854c7 100644
--- a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/extension/UnsetFcoreExtensionCommand.java
+++ b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/extension/UnsetFcoreExtensionCommand.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/resource/FcoreResourceListener.java b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/resource/FcoreResourceListener.java
index 40ecf7b..face3f1 100644
--- a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/resource/FcoreResourceListener.java
+++ b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/resource/FcoreResourceListener.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/resource/ResourceFcoreDelta.java b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/resource/ResourceFcoreDelta.java
index c480aee..9def0a9 100644
--- a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/resource/ResourceFcoreDelta.java
+++ b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/resource/ResourceFcoreDelta.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/ui/PDEModelUtility.java b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/ui/PDEModelUtility.java
index d243a6a..6630793 100644
--- a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/ui/PDEModelUtility.java
+++ b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/internal/ui/PDEModelUtility.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2005-2008 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM - Initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/l10n/EGFPDEMessages.java b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/l10n/EGFPDEMessages.java
index 441070e..8fce62f 100644
--- a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/l10n/EGFPDEMessages.java
+++ b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/l10n/EGFPDEMessages.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/l10n/messages.properties b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/l10n/messages.properties
index 6767ade..845da0d 100644
--- a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/l10n/messages.properties
+++ b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/l10n/messages.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/plugin/AbstractChangesCommand.java b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/plugin/AbstractChangesCommand.java
index b543137..1882505 100644
--- a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/plugin/AbstractChangesCommand.java
+++ b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/plugin/AbstractChangesCommand.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/plugin/AbstractExtensionChangesCommand.java b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/plugin/AbstractExtensionChangesCommand.java
index 798c908..2988503 100644
--- a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/plugin/AbstractExtensionChangesCommand.java
+++ b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/plugin/AbstractExtensionChangesCommand.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/plugin/IPluginChangesCommand.java b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/plugin/IPluginChangesCommand.java
index 09a7271..f089406 100644
--- a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/plugin/IPluginChangesCommand.java
+++ b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/plugin/IPluginChangesCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/tools/ConvertProjectOperation.java b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/tools/ConvertProjectOperation.java
index c05ee2d..d4a204c 100644
--- a/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/tools/ConvertProjectOperation.java
+++ b/plugins/org.eclipse.egf.core.pde/src/org/eclipse/egf/core/pde/tools/ConvertProjectOperation.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.core.platform/build.properties b/plugins/org.eclipse.egf.core.platform/build.properties
index e169a27..da81787 100644
--- a/plugins/org.eclipse.egf.core.platform/build.properties
+++ b/plugins/org.eclipse.egf.core.platform/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/plugin.properties b/plugins/org.eclipse.egf.core.platform/plugin.properties
index 52bca75..2f46069 100644
--- a/plugins/org.eclipse.egf.core.platform/plugin.properties
+++ b/plugins/org.eclipse.egf.core.platform/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/plugin.xml b/plugins/org.eclipse.egf.core.platform/plugin.xml
index b5a97be..22db9d9 100644
--- a/plugins/org.eclipse.egf.core.platform/plugin.xml
+++ b/plugins/org.eclipse.egf.core.platform/plugin.xml
Binary files differ
diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/EGFPlatformPlugin.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/EGFPlatformPlugin.java
index f468e24..12aaaa0 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/EGFPlatformPlugin.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/EGFPlatformPlugin.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/loader/BundleClassLoader.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/loader/BundleClassLoader.java
index 7f90dab..f94f67d 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/loader/BundleClassLoader.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/loader/BundleClassLoader.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/AbstractPlatformExtensionPoint.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/AbstractPlatformExtensionPoint.java
index 6021119..1546f87 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/AbstractPlatformExtensionPoint.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/AbstractPlatformExtensionPoint.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/AbstractPlatformManager.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/AbstractPlatformManager.java
index b9bdf71..6957caa 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/AbstractPlatformManager.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/AbstractPlatformManager.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/DirectoryBuildModel.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/DirectoryBuildModel.java
index db536bd..66fcdd8 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/DirectoryBuildModel.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/DirectoryBuildModel.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/IManagerConstants.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/IManagerConstants.java
index 8ba8562..2a2d988 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/IManagerConstants.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/IManagerConstants.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/PlatformBundle.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/PlatformBundle.java
index c44bbe2..737ba31 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/PlatformBundle.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/PlatformBundle.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/PlatformClasspathContainer.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/PlatformClasspathContainer.java
index df158ff..ed8ad6c 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/PlatformClasspathContainer.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/PlatformClasspathContainer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  *  Copyright (c) 2005, 2008 IBM Corporation and others.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/PlatformExtensionPointDelta.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/PlatformExtensionPointDelta.java
index c4094db..7041e92 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/PlatformExtensionPointDelta.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/PlatformExtensionPointDelta.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/PlatformRequiredPluginsClasspathContainer.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/PlatformRequiredPluginsClasspathContainer.java
index 8140323..7409057 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/PlatformRequiredPluginsClasspathContainer.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/PlatformRequiredPluginsClasspathContainer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  *  Copyright (c) 2000, 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

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/TargetPlatformExtensionPointDelta.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/TargetPlatformExtensionPointDelta.java
index 528f887..55ce976 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/TargetPlatformExtensionPointDelta.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/internal/pde/TargetPlatformExtensionPointDelta.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/l10n/CorePlatformMessages.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/l10n/CorePlatformMessages.java
index 14546fb..5b985d4 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/l10n/CorePlatformMessages.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/l10n/CorePlatformMessages.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/l10n/messages.properties b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/l10n/messages.properties
index 3517b0e..766e120 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/l10n/messages.properties
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/l10n/messages.properties
@@ -1,9 +1,12 @@
 ##

-# Copyright (c) 2000, 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

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+#  Copyright (c) 2000, 2009 IBM Corporation and others.

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 # Contributors:

 #     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/loader/BundleClassLoaderFactory.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/loader/BundleClassLoaderFactory.java
index 176f49b..1ccafd2 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/loader/BundleClassLoaderFactory.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/loader/BundleClassLoaderFactory.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Soyatec.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Soyatec - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/loader/IBundleClassLoader.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/loader/IBundleClassLoader.java
index 8399209..397d59e 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/loader/IBundleClassLoader.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/loader/IBundleClassLoader.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformBundle.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformBundle.java
index ae9c005..be1557b 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformBundle.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformBundle.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformExtensionPoint.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformExtensionPoint.java
index 03b9566..295f937 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformExtensionPoint.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformExtensionPoint.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformExtensionPointDelta.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformExtensionPointDelta.java
index fd44673..2eb6e80 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformExtensionPointDelta.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformExtensionPointDelta.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformExtensionPointFactory.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformExtensionPointFactory.java
index 7281035..5a41ea5 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformExtensionPointFactory.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformExtensionPointFactory.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformExtensionPointListener.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformExtensionPointListener.java
index 8be35aa..6ac6517 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformExtensionPointListener.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformExtensionPointListener.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformExtensionPointURI.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformExtensionPointURI.java
index a69a8d9..8c2a4d6 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformExtensionPointURI.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformExtensionPointURI.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformManager.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformManager.java
index 291ca1f..ebf97a8 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformManager.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformManager.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformRuntimeExtensionProxy.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformRuntimeExtensionProxy.java
index f0ab5f7..88a292c 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformRuntimeExtensionProxy.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformRuntimeExtensionProxy.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformRuntimeExtensionProxyFactory.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformRuntimeExtensionProxyFactory.java
index 1eae11b..91b58fa 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformRuntimeExtensionProxyFactory.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformRuntimeExtensionProxyFactory.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformRuntimeRegistry.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformRuntimeRegistry.java
index 4c8206f..8385eef 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformRuntimeRegistry.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/IPlatformRuntimeRegistry.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/ITargetPlatformExtensionPointDelta.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/ITargetPlatformExtensionPointDelta.java
index 1430c6e..4367dcc 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/ITargetPlatformExtensionPointDelta.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/ITargetPlatformExtensionPointDelta.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/PlatformExtensionPoint.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/PlatformExtensionPoint.java
index 02ee470..e20fdef 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/PlatformExtensionPoint.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/PlatformExtensionPoint.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/PlatformExtensionPointURI.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/PlatformExtensionPointURI.java
index 616ef35..cc4664b 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/PlatformExtensionPointURI.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/pde/PlatformExtensionPointURI.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/uri/DomainURIHandlerImpl.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/uri/DomainURIHandlerImpl.java
index 795a3d5..45d86ad 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/uri/DomainURIHandlerImpl.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/uri/DomainURIHandlerImpl.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2015 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/uri/EgfURIConverter.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/uri/EgfURIConverter.java
index 182f7d8..3ba9865 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/uri/EgfURIConverter.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/uri/EgfURIConverter.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2015 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/uri/PlatformXMLURIHandler.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/uri/PlatformXMLURIHandler.java
index d6b1654..70c73d0 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/uri/PlatformXMLURIHandler.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/uri/PlatformXMLURIHandler.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/uri/TargetPlatformURIConverter.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/uri/TargetPlatformURIConverter.java
index 1e08725..4c4fb4d 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/uri/TargetPlatformURIConverter.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/uri/TargetPlatformURIConverter.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/uri/TargetPlatformURIHandlerImpl.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/uri/TargetPlatformURIHandlerImpl.java
index 6452107..b6f3932 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/uri/TargetPlatformURIHandlerImpl.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/uri/TargetPlatformURIHandlerImpl.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * 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
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/util/CollectionHelper.java b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/util/CollectionHelper.java
index 31047ae..a22c2a7 100644
--- a/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/util/CollectionHelper.java
+++ b/plugins/org.eclipse.egf.core.platform/src/org/eclipse/egf/core/platform/util/CollectionHelper.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.producer/build.properties b/plugins/org.eclipse.egf.core.producer/build.properties
index c9848de..50cb85c 100644
--- a/plugins/org.eclipse.egf.core.producer/build.properties
+++ b/plugins/org.eclipse.egf.core.producer/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.producer/plugin.properties b/plugins/org.eclipse.egf.core.producer/plugin.properties
index 4d86517..aeda0f8 100644
--- a/plugins/org.eclipse.egf.core.producer/plugin.properties
+++ b/plugins/org.eclipse.egf.core.producer/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/EGFCoreProducerPlugin.java b/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/EGFCoreProducerPlugin.java
index 5c26abd..6243f20 100644
--- a/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/EGFCoreProducerPlugin.java
+++ b/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/EGFCoreProducerPlugin.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/InvocationException.java b/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/InvocationException.java
index badf01a..ab34578 100644
--- a/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/InvocationException.java
+++ b/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/InvocationException.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/MissingExtensionException.java b/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/MissingExtensionException.java
index 20ae169..7861cb2 100644
--- a/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/MissingExtensionException.java
+++ b/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/MissingExtensionException.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/context/IProductionContext.java b/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/context/IProductionContext.java
index 38e8e58..786b878 100644
--- a/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/context/IProductionContext.java
+++ b/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/context/IProductionContext.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/context/ProductionContext.java b/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/context/ProductionContext.java
index 11a0e9b..fa75b9b 100644
--- a/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/context/ProductionContext.java
+++ b/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/context/ProductionContext.java
@@ -1,10 +1,12 @@
 /**
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/l10n/CoreProducerMessages.java b/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/l10n/CoreProducerMessages.java
index 6bc628a..4de5708 100644
--- a/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/l10n/CoreProducerMessages.java
+++ b/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/l10n/CoreProducerMessages.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/l10n/messages.properties b/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/l10n/messages.properties
index fd9fea1..d84cc74 100644
--- a/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/l10n/messages.properties
+++ b/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/l10n/messages.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/manager/IProducerManager.java b/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/manager/IProducerManager.java
index d17aa02..a7998eb 100644
--- a/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/manager/IProducerManager.java
+++ b/plugins/org.eclipse.egf.core.producer/src/org/eclipse/egf/core/producer/manager/IProducerManager.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/build.properties b/plugins/org.eclipse.egf.core.ui/build.properties
index 0410b2d..31a9bcc 100644
--- a/plugins/org.eclipse.egf.core.ui/build.properties
+++ b/plugins/org.eclipse.egf.core.ui/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/plugin.properties b/plugins/org.eclipse.egf.core.ui/plugin.properties
index 968b5ae..048ac8a 100644
--- a/plugins/org.eclipse.egf.core.ui/plugin.properties
+++ b/plugins/org.eclipse.egf.core.ui/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/plugin.xml b/plugins/org.eclipse.egf.core.ui/plugin.xml
index e4536b3..4c8c030 100644
--- a/plugins/org.eclipse.egf.core.ui/plugin.xml
+++ b/plugins/org.eclipse.egf.core.ui/plugin.xml
Binary files differ
diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/EGFCoreUIPlugin.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/EGFCoreUIPlugin.java
index 746a901..88342c8 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/EGFCoreUIPlugin.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/EGFCoreUIPlugin.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/ExceptionHandler.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/ExceptionHandler.java
index d4da641..7378587 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/ExceptionHandler.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/ExceptionHandler.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2000, 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
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/IEGFCoreUIImages.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/IEGFCoreUIImages.java
index 75192e4..e309661 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/IEGFCoreUIImages.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/IEGFCoreUIImages.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/actions/OpenFcoreAction.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/actions/OpenFcoreAction.java
index f61ab9a..af01b49 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/actions/OpenFcoreAction.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/actions/OpenFcoreAction.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/contributor/DefaultPropertyEditorContributor.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/contributor/DefaultPropertyEditorContributor.java
index d81845b..bc87198 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/contributor/DefaultPropertyEditorContributor.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/contributor/DefaultPropertyEditorContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/contributor/EditorListenerContributor.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/contributor/EditorListenerContributor.java
index 5419f53..3a0a7d5 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/contributor/EditorListenerContributor.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/contributor/EditorListenerContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/contributor/EditorMenuContributor.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/contributor/EditorMenuContributor.java
index ef1f985..e31f5ad 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/contributor/EditorMenuContributor.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/contributor/EditorMenuContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/contributor/IMenuEditorActionBarContributor.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/contributor/IMenuEditorActionBarContributor.java
index d6082ff..0af534c 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/contributor/IMenuEditorActionBarContributor.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/contributor/IMenuEditorActionBarContributor.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/contributor/PropertyEditorContributor.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/contributor/PropertyEditorContributor.java
index 8933d96..d0d19a0 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/contributor/PropertyEditorContributor.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/contributor/PropertyEditorContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/diagnostic/EGFDiagnosticComposite.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/diagnostic/EGFDiagnosticComposite.java
index 6e358b2..cb90727 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/diagnostic/EGFDiagnosticComposite.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/diagnostic/EGFDiagnosticComposite.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * 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

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM - Initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/diagnostic/EGFDiagnosticDialog.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/diagnostic/EGFDiagnosticDialog.java
index c3dbe47..3725990 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/diagnostic/EGFDiagnosticDialog.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/diagnostic/EGFDiagnosticDialog.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * 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

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM - Initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/diagnostic/EGFValidator.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/diagnostic/EGFValidator.java
index ca49fc6..e4196ab 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/diagnostic/EGFValidator.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/diagnostic/EGFValidator.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

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

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM - Initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/AbstractCheckboxSelectionDialog.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/AbstractCheckboxSelectionDialog.java
index 1748c95..cf85ec7 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/AbstractCheckboxSelectionDialog.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/AbstractCheckboxSelectionDialog.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2006, 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

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/AbstractFilteredItemsSelectionDialog.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/AbstractFilteredItemsSelectionDialog.java
index 0bf7c51..6ce6cd8 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/AbstractFilteredItemsSelectionDialog.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/AbstractFilteredItemsSelectionDialog.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/AbstractSelectionDialog.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/AbstractSelectionDialog.java
index c2b2153..40693b0 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/AbstractSelectionDialog.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/AbstractSelectionDialog.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2006, 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

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/FcoreSelectionDialog.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/FcoreSelectionDialog.java
index f9d05d2..553cf28 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/FcoreSelectionDialog.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/FcoreSelectionDialog.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/ISelectionDialogListener.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/ISelectionDialogListener.java
index 958e36c..ab3fc3d 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/ISelectionDialogListener.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/ISelectionDialogListener.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/ResourcesSelectionDialog.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/ResourcesSelectionDialog.java
index 096a202..008bd25 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/ResourcesSelectionDialog.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/ResourcesSelectionDialog.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/SubTypeSelectionExtension.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/SubTypeSelectionExtension.java
index 78b7c6e..3df3df6 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/SubTypeSelectionExtension.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/SubTypeSelectionExtension.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/TargetPlatformEcoreDialog.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/TargetPlatformEcoreDialog.java
index e78ddf1..4b6acc7 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/TargetPlatformEcoreDialog.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/TargetPlatformEcoreDialog.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/TargetPlatformEcoreSelectionDialog.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/TargetPlatformEcoreSelectionDialog.java
index f09d449..5953b7e 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/TargetPlatformEcoreSelectionDialog.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/TargetPlatformEcoreSelectionDialog.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/TargetPlatformPackageDialog.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/TargetPlatformPackageDialog.java
index fc08079..888eb33 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/TargetPlatformPackageDialog.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/TargetPlatformPackageDialog.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/TypeSelectionDialog.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/TypeSelectionDialog.java
index 8b99cf8..08c6fe1 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/TypeSelectionDialog.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/dialogs/TypeSelectionDialog.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/SWTFactory.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/SWTFactory.java
index 84f36f8..da18648 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/SWTFactory.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/SWTFactory.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2000, 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

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/preferences/EGFGeneralPreferencePage.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/preferences/EGFGeneralPreferencePage.java
index d320674..218bf2e 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/preferences/EGFGeneralPreferencePage.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/preferences/EGFGeneralPreferencePage.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/preferences/EGFModelPreferencePage.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/preferences/EGFModelPreferencePage.java
index c649d2b..7e26c91 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/preferences/EGFModelPreferencePage.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/preferences/EGFModelPreferencePage.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/preferences/EGFProductionPreferencePage.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/preferences/EGFProductionPreferencePage.java
index 854340a..8c1032f 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/preferences/EGFProductionPreferencePage.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/preferences/EGFProductionPreferencePage.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/preferences/ModelPreferenceInitializer.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/preferences/ModelPreferenceInitializer.java
index c3393af..22d9e3d 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/preferences/ModelPreferenceInitializer.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/preferences/ModelPreferenceInitializer.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2000, 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
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/registry/EditorListenerContributorProxy.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/registry/EditorListenerContributorProxy.java
index f0ee25f..fb3405b 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/registry/EditorListenerContributorProxy.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/registry/EditorListenerContributorProxy.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/registry/EditorListenerContributorRegistry.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/registry/EditorListenerContributorRegistry.java
index 9d7a544..7da51f8 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/registry/EditorListenerContributorRegistry.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/registry/EditorListenerContributorRegistry.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/registry/EditorMenuContributorProxy.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/registry/EditorMenuContributorProxy.java
index 1ed56ae..bb283b3 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/registry/EditorMenuContributorProxy.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/registry/EditorMenuContributorProxy.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/registry/EditorMenuContributorRegistry.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/registry/EditorMenuContributorRegistry.java
index 0c2a76d..307da50 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/registry/EditorMenuContributorRegistry.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/registry/EditorMenuContributorRegistry.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/registry/PropertyEditorContributorProxy.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/registry/PropertyEditorContributorProxy.java
index 39ed387..ba5334c 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/registry/PropertyEditorContributorProxy.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/registry/PropertyEditorContributorProxy.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/registry/PropertyEditorContributorRegistry.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/registry/PropertyEditorContributorRegistry.java
index 0d963b5..7f9ff72 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/registry/PropertyEditorContributorRegistry.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/internal/registry/PropertyEditorContributorRegistry.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/l10n/CoreUIMessages.java b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/l10n/CoreUIMessages.java
index e22fec1..6ba95dc 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/l10n/CoreUIMessages.java
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/l10n/CoreUIMessages.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/l10n/messages.properties b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/l10n/messages.properties
index b6f914b..667eb93 100644
--- a/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/l10n/messages.properties
+++ b/plugins/org.eclipse.egf.core.ui/src/org/eclipse/egf/core/ui/l10n/messages.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/build.properties b/plugins/org.eclipse.egf.core/build.properties
index 6f82c70..c979c89 100644
--- a/plugins/org.eclipse.egf.core/build.properties
+++ b/plugins/org.eclipse.egf.core/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009, 2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/plugin.properties b/plugins/org.eclipse.egf.core/plugin.properties
index 798d11b..9da9392 100644
--- a/plugins/org.eclipse.egf.core/plugin.properties
+++ b/plugins/org.eclipse.egf.core/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/plugin.xml b/plugins/org.eclipse.egf.core/plugin.xml
index 3e35bee..94aa2d3 100644
--- a/plugins/org.eclipse.egf.core/plugin.xml
+++ b/plugins/org.eclipse.egf.core/plugin.xml
Binary files differ
diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/EGFCoreDebug.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/EGFCoreDebug.java
index 1c32317..3b217ae 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/EGFCoreDebug.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/EGFCoreDebug.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/EGFCorePlugin.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/EGFCorePlugin.java
index 6daccaa..c3adc1e 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/EGFCorePlugin.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/EGFCorePlugin.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
  */
diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/DiagnosticResourceException.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/DiagnosticResourceException.java
index 6e95968..4c28ca4 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/DiagnosticResourceException.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/DiagnosticResourceException.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/EgfEditingDomain.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/EgfEditingDomain.java
index 53214df..5bcce45 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/EgfEditingDomain.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/EgfEditingDomain.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/EgfEditingDomainAdapterFactory.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/EgfEditingDomainAdapterFactory.java
index 571459e..33982eb 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/EgfEditingDomainAdapterFactory.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/EgfEditingDomainAdapterFactory.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2015 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/EgfEditingDomainFactory.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/EgfEditingDomainFactory.java
index 2636729..4a3750b 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/EgfEditingDomainFactory.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/EgfEditingDomainFactory.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/EgfResourceSet.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/EgfResourceSet.java
index a3fd6ed..6a0453b 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/EgfResourceSet.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/EgfResourceSet.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2015 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/PlatformResourceLoadedListener.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/PlatformResourceLoadedListener.java
index 9c0ac75..70eb535 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/PlatformResourceLoadedListener.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/PlatformResourceLoadedListener.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/ResourceModificationManager.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/ResourceModificationManager.java
index 9f58c86..ea8b64f 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/ResourceModificationManager.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/ResourceModificationManager.java
@@ -1,9 +1,11 @@
 /**

  * 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

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/RuntimePlatformResourceSet.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/RuntimePlatformResourceSet.java
index fa11acd..6f2b73d 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/RuntimePlatformResourceSet.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/RuntimePlatformResourceSet.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/TargetPlatformResourceSet.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/TargetPlatformResourceSet.java
index b5939ca..b58cad7 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/TargetPlatformResourceSet.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/domain/TargetPlatformResourceSet.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/IProxyEClass.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/IProxyEClass.java
index b5d28c7..f9556ac 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/IProxyEClass.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/IProxyEClass.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/IProxyEClassifier.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/IProxyEClassifier.java
index 70c73c8..f1d246a 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/IProxyEClassifier.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/IProxyEClassifier.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/IProxyEDataType.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/IProxyEDataType.java
index d12cc39..1b61789 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/IProxyEDataType.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/IProxyEDataType.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/IProxyEObject.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/IProxyEObject.java
index 06b3faf..3977474 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/IProxyEObject.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/IProxyEObject.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/IProxyEPackage.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/IProxyEPackage.java
index 792f86b..0b05fcc 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/IProxyEPackage.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/IProxyEPackage.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/IProxyERoot.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/IProxyERoot.java
index aa73777..8f3ba0c 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/IProxyERoot.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/IProxyERoot.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/ProxyFactory.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/ProxyFactory.java
index 22a9bcd..c4e8940 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/ProxyFactory.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/ProxyFactory.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/ProxyTargetPlatformFactory.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/ProxyTargetPlatformFactory.java
index b8416f7..91cf2c0 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/ProxyTargetPlatformFactory.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/epackage/ProxyTargetPlatformFactory.java
@@ -1,9 +1,11 @@
 /**
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/fcore/IPlatformFcore.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/fcore/IPlatformFcore.java
index 3d3ddba..749984b 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/fcore/IPlatformFcore.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/fcore/IPlatformFcore.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/fcore/IPlatformFcoreConstants.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/fcore/IPlatformFcoreConstants.java
index 23a45ea..bdd049d 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/fcore/IPlatformFcoreConstants.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/fcore/IPlatformFcoreConstants.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/fcore/IPlatformFcoreProvider.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/fcore/IPlatformFcoreProvider.java
index df0d38b..27b66eb 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/fcore/IPlatformFcoreProvider.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/fcore/IPlatformFcoreProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/fcore/IResourceFcoreDelta.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/fcore/IResourceFcoreDelta.java
index b614108..0496147 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/fcore/IResourceFcoreDelta.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/fcore/IResourceFcoreDelta.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/genmodel/IPlatformGenModel.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/genmodel/IPlatformGenModel.java
index bb5ec31..8ad3b31 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/genmodel/IPlatformGenModel.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/genmodel/IPlatformGenModel.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/genmodel/IPlatformGenModelConstants.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/genmodel/IPlatformGenModelConstants.java
index 45b175d..64b4f53 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/genmodel/IPlatformGenModelConstants.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/genmodel/IPlatformGenModelConstants.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/helper/BundleSessionHelper.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/helper/BundleSessionHelper.java
index c826e13..807e322 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/helper/BundleSessionHelper.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/helper/BundleSessionHelper.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/helper/EclipseBuilderHelper.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/helper/EclipseBuilderHelper.java
index c86eb9f..0e06565 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/helper/EclipseBuilderHelper.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/helper/EclipseBuilderHelper.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/helper/ProjectHelper.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/helper/ProjectHelper.java
index 7602200..dd5d0bf 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/helper/ProjectHelper.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/helper/ProjectHelper.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/helper/ResourceHelper.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/helper/ResourceHelper.java
index 0db53da..1f65ac3 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/helper/ResourceHelper.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/helper/ResourceHelper.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/epackage/ProxyEClass.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/epackage/ProxyEClass.java
index a6e3a1e..03ef6a4 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/epackage/ProxyEClass.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/epackage/ProxyEClass.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/epackage/ProxyEClassifier.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/epackage/ProxyEClassifier.java
index c25e2d5..81cffe2 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/epackage/ProxyEClassifier.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/epackage/ProxyEClassifier.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/epackage/ProxyEDataType.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/epackage/ProxyEDataType.java
index 5cc6aca..1f144bb 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/epackage/ProxyEDataType.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/epackage/ProxyEDataType.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/epackage/ProxyEObject.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/epackage/ProxyEObject.java
index d662fc0..c9c54b8 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/epackage/ProxyEObject.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/epackage/ProxyEObject.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/epackage/ProxyEPackage.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/epackage/ProxyEPackage.java
index d153a95..e55fb84 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/epackage/ProxyEPackage.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/epackage/ProxyEPackage.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/epackage/ProxyERoot.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/epackage/ProxyERoot.java
index 9a6ee0b..fabe887 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/epackage/ProxyERoot.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/epackage/ProxyERoot.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/fcore/PlatformFcore.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/fcore/PlatformFcore.java
index 10975da..94035aa 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/fcore/PlatformFcore.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/fcore/PlatformFcore.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/fcore/PlatformFcoreFactory.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/fcore/PlatformFcoreFactory.java
index b2702e5..7b52d2e 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/fcore/PlatformFcoreFactory.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/fcore/PlatformFcoreFactory.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/genmodel/PlatformGenModel.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/genmodel/PlatformGenModel.java
index 06ac94f..ced158e 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/genmodel/PlatformGenModel.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/genmodel/PlatformGenModel.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/genmodel/PlatformGenModelFactory.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/genmodel/PlatformGenModelFactory.java
index c858be4..82707a1 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/genmodel/PlatformGenModelFactory.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/genmodel/PlatformGenModelFactory.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/natures/BaseProject.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/natures/BaseProject.java
index 5b9f889..c629ffd 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/natures/BaseProject.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/natures/BaseProject.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2000, 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
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/natures/FcoreProject.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/natures/FcoreProject.java
index a3b8b21..99fbfad 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/natures/FcoreProject.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/natures/FcoreProject.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/registry/FcoreProcessorProxy.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/registry/FcoreProcessorProxy.java
index 25e679e..4e748d6 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/registry/FcoreProcessorProxy.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/registry/FcoreProcessorProxy.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/registry/FcoreProcessorRegistry.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/registry/FcoreProcessorRegistry.java
index e6d551d..82f60ab 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/registry/FcoreProcessorRegistry.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/internal/registry/FcoreProcessorRegistry.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/l10n/EGFCoreMessages.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/l10n/EGFCoreMessages.java
index 35ea067..33009ee 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/l10n/EGFCoreMessages.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/l10n/EGFCoreMessages.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/l10n/messages.properties b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/l10n/messages.properties
index ead820f..9b86470 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/l10n/messages.properties
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/l10n/messages.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/natures/EGFNatures.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/natures/EGFNatures.java
index b0f91f1..cea5c40 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/natures/EGFNatures.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/natures/EGFNatures.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/pattern/PatternFolders.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/pattern/PatternFolders.java
index 3a96e35..44ebab7 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/pattern/PatternFolders.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/pattern/PatternFolders.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/preferences/IEGFModelConstants.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/preferences/IEGFModelConstants.java
index 13169e1..f337a2f 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/preferences/IEGFModelConstants.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/preferences/IEGFModelConstants.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/processor/IFcoreProcessor.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/processor/IFcoreProcessor.java
index f5e3cc3..4e85618 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/processor/IFcoreProcessor.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/processor/IFcoreProcessor.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/session/EGFBundleListener.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/session/EGFBundleListener.java
index a028d48..0d04d65 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/session/EGFBundleListener.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/session/EGFBundleListener.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/session/ProjectBundleSession.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/session/ProjectBundleSession.java
index 57a9b12..e8b63be 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/session/ProjectBundleSession.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/session/ProjectBundleSession.java
@@ -1,9 +1,11 @@
 /**

  * 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

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/workspace/EGFChangedSyncRequest.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/workspace/EGFChangedSyncRequest.java
index c0da2f7..67bcc9e 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/workspace/EGFChangedSyncRequest.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/workspace/EGFChangedSyncRequest.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * 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

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM - Initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/workspace/EGFDeletedSyncRequest.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/workspace/EGFDeletedSyncRequest.java
index 39a33bb..bf9841a 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/workspace/EGFDeletedSyncRequest.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/workspace/EGFDeletedSyncRequest.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * 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

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM - Initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/workspace/EGFMovedSyncRequest.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/workspace/EGFMovedSyncRequest.java
index 55b0739..ec4322b 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/workspace/EGFMovedSyncRequest.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/workspace/EGFMovedSyncRequest.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * 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

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM - Initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/workspace/EGFPersistedSyncRequest.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/workspace/EGFPersistedSyncRequest.java
index f16a5b1..a550bc1 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/workspace/EGFPersistedSyncRequest.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/workspace/EGFPersistedSyncRequest.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/workspace/EGFSyncRequest.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/workspace/EGFSyncRequest.java
index 4f59494..d92b38b 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/workspace/EGFSyncRequest.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/workspace/EGFSyncRequest.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2005, 2008 IBM Corporation, Zeligsoft Inc. and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM - Initial API and implementation

diff --git a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/workspace/EGFWorkspaceSynchronizer.java b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/workspace/EGFWorkspaceSynchronizer.java
index 9605eb3..d79e098 100644
--- a/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/workspace/EGFWorkspaceSynchronizer.java
+++ b/plugins/org.eclipse.egf.core/src/org/eclipse/egf/core/workspace/EGFWorkspaceSynchronizer.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2005, 2008 IBM Corporation, Zeligsoft Inc. and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM - Initial API and implementation

diff --git a/plugins/org.eclipse.egf.dev/build.properties b/plugins/org.eclipse.egf.dev/build.properties
index cfab5e1..10c2947 100644
--- a/plugins/org.eclipse.egf.dev/build.properties
+++ b/plugins/org.eclipse.egf.dev/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.dev/plugin.properties b/plugins/org.eclipse.egf.dev/plugin.properties
index 3e1abc5..e159e7b 100644
--- a/plugins/org.eclipse.egf.dev/plugin.properties
+++ b/plugins/org.eclipse.egf.dev/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.dev/src/org/eclipse/egf/dev/Activator.java b/plugins/org.eclipse.egf.dev/src/org/eclipse/egf/dev/Activator.java
index 7325926..83c6a49 100644
--- a/plugins/org.eclipse.egf.dev/src/org/eclipse/egf/dev/Activator.java
+++ b/plugins/org.eclipse.egf.dev/src/org/eclipse/egf/dev/Activator.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.dev/src/org/eclipse/egf/dev/pattern/actions/DeleteUnusedTemplatesAction.java b/plugins/org.eclipse.egf.dev/src/org/eclipse/egf/dev/pattern/actions/DeleteUnusedTemplatesAction.java
index 9364a6b..b5ba531 100644
--- a/plugins/org.eclipse.egf.dev/src/org/eclipse/egf/dev/pattern/actions/DeleteUnusedTemplatesAction.java
+++ b/plugins/org.eclipse.egf.dev/src/org/eclipse/egf/dev/pattern/actions/DeleteUnusedTemplatesAction.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.dev/src/org/eclipse/egf/dev/pattern/actions/TranslateAllAction.java b/plugins/org.eclipse.egf.dev/src/org/eclipse/egf/dev/pattern/actions/TranslateAllAction.java
index 20229fe..075ef83 100644
--- a/plugins/org.eclipse.egf.dev/src/org/eclipse/egf/dev/pattern/actions/TranslateAllAction.java
+++ b/plugins/org.eclipse.egf.dev/src/org/eclipse/egf/dev/pattern/actions/TranslateAllAction.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.dev/src/org/eclipse/egf/dev/pattern/contributions/PatternMenuContributor.java b/plugins/org.eclipse.egf.dev/src/org/eclipse/egf/dev/pattern/contributions/PatternMenuContributor.java
index 9ac173d..2da7f82 100644
--- a/plugins/org.eclipse.egf.dev/src/org/eclipse/egf/dev/pattern/contributions/PatternMenuContributor.java
+++ b/plugins/org.eclipse.egf.dev/src/org/eclipse/egf/dev/pattern/contributions/PatternMenuContributor.java
@@ -1,10 +1,12 @@
 /**
  * <copyright>
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
  * </copyright>
diff --git a/plugins/org.eclipse.egf.domain/build.properties b/plugins/org.eclipse.egf.domain/build.properties
index 0d4a523..e92a7d6 100644
--- a/plugins/org.eclipse.egf.domain/build.properties
+++ b/plugins/org.eclipse.egf.domain/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.domain/plugin.properties b/plugins/org.eclipse.egf.domain/plugin.properties
index 8ae1f51..6bc5203 100644
--- a/plugins/org.eclipse.egf.domain/plugin.properties
+++ b/plugins/org.eclipse.egf.domain/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.domain/plugin.xml b/plugins/org.eclipse.egf.domain/plugin.xml
index 91c5e6a..0cdb7a8 100644
--- a/plugins/org.eclipse.egf.domain/plugin.xml
+++ b/plugins/org.eclipse.egf.domain/plugin.xml
Binary files differ
diff --git a/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/Activator.java b/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/Activator.java
index 2c54882..44d4c66 100644
--- a/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/Activator.java
+++ b/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/Activator.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/DomainException.java b/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/DomainException.java
index 2b226cb..67d1700 100644
--- a/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/DomainException.java
+++ b/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/DomainException.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/IDomainHelper.java b/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/IDomainHelper.java
index 664a874..fefb857 100644
--- a/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/IDomainHelper.java
+++ b/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/IDomainHelper.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/LoadableDomainHelper.java b/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/LoadableDomainHelper.java
index 292d1d0..677fc42 100644
--- a/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/LoadableDomainHelper.java
+++ b/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/LoadableDomainHelper.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/Messages.java b/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/Messages.java
index ca8ffd9..5e14827 100644
--- a/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/Messages.java
+++ b/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/Messages.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/emf/EMFDomainHelper.java b/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/emf/EMFDomainHelper.java
index 56fb2b8..31084ee 100644
--- a/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/emf/EMFDomainHelper.java
+++ b/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/emf/EMFDomainHelper.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/file/FilesystemDomainHelper.java b/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/file/FilesystemDomainHelper.java
index fcd1ffa..719b187 100644
--- a/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/file/FilesystemDomainHelper.java
+++ b/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/file/FilesystemDomainHelper.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/file/WorkspaceDomainHelper.java b/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/file/WorkspaceDomainHelper.java
index a4d0a1f..dc07b32 100644
--- a/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/file/WorkspaceDomainHelper.java
+++ b/plugins/org.eclipse.egf.domain/src/org/eclipse/egf/domain/file/WorkspaceDomainHelper.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.edit/build.properties b/plugins/org.eclipse.egf.model.edit/build.properties
index ea05076..1bfada2 100644
--- a/plugins/org.eclipse.egf.model.edit/build.properties
+++ b/plugins/org.eclipse.egf.model.edit/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/DomainItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/DomainItemProvider.java
index 8c8c16a..93d8d68 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/DomainItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/DomainItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/DomainItemProviderAdapterFactory.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/DomainItemProviderAdapterFactory.java
index 010e417..a4884ee 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/DomainItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/DomainItemProviderAdapterFactory.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/DomainViewpointItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/DomainViewpointItemProvider.java
index bed0c7c..82be252 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/DomainViewpointItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/DomainViewpointItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/EMFDomainItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/EMFDomainItemProvider.java
index e012b3a..5f16efa 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/EMFDomainItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/EMFDomainItemProvider.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/FilesystemDomainItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/FilesystemDomainItemProvider.java
index 4ed660a..c718b52 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/FilesystemDomainItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/FilesystemDomainItemProvider.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/LoadableDomainItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/LoadableDomainItemProvider.java
index 035b722..dc73a88 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/LoadableDomainItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/LoadableDomainItemProvider.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/TypeDomainItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/TypeDomainItemProvider.java
index 5403e9e..25db2d8 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/TypeDomainItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/TypeDomainItemProvider.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/TypeGenPackagesItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/TypeGenPackagesItemProvider.java
index c37e6db..cdb8a33 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/TypeGenPackagesItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/TypeGenPackagesItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/WorkspaceDomainItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/WorkspaceDomainItemProvider.java
index b52cc0d..37e198d 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/WorkspaceDomainItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/domain/provider/WorkspaceDomainItemProvider.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/edit/EGFModelEditPlugin.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/edit/EGFModelEditPlugin.java
index d4a5e1c..01b2db1 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/edit/EGFModelEditPlugin.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/edit/EGFModelEditPlugin.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/ActivityItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/ActivityItemProvider.java
index e2d39fa..abb2521 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/ActivityItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/ActivityItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/ContractContainerItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/ContractContainerItemProvider.java
index 7a8856e..a5b3b56 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/ContractContainerItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/ContractContainerItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/ContractItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/ContractItemProvider.java
index 7255c1c..e3a7662 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/ContractItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/ContractItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/FactoryComponentContractItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/FactoryComponentContractItemProvider.java
index f6cfde1..6c79e0c 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/FactoryComponentContractItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/FactoryComponentContractItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/FactoryComponentItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/FactoryComponentItemProvider.java
index e4b8224..6213069 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/FactoryComponentItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/FactoryComponentItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/FcoreItemProviderAdapterFactory.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/FcoreItemProviderAdapterFactory.java
index ef332be..0c12eb6 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/FcoreItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/FcoreItemProviderAdapterFactory.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/InvocationContractContainerItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/InvocationContractContainerItemProvider.java
index ce21cb0..420ca84 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/InvocationContractContainerItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/InvocationContractContainerItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/InvocationContractItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/InvocationContractItemProvider.java
index a0b14c9..9601211 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/InvocationContractItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/InvocationContractItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/InvocationItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/InvocationItemProvider.java
index 595a25e..f85e48c 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/InvocationItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/InvocationItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/ModelElementItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/ModelElementItemProvider.java
index 5f9b097..8d0be21 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/ModelElementItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/ModelElementItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/NamedModelElementItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/NamedModelElementItemProvider.java
index 5b52154..141ac4b 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/NamedModelElementItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/NamedModelElementItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/OrchestrationItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/OrchestrationItemProvider.java
index e6c9561..0ad12e4 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/OrchestrationItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/OrchestrationItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/OrchestrationParameterContainerItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/OrchestrationParameterContainerItemProvider.java
index 9688998..0ee7f9d 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/OrchestrationParameterContainerItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/OrchestrationParameterContainerItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/OrchestrationParameterItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/OrchestrationParameterItemProvider.java
index 8fd6774..8e8b69f 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/OrchestrationParameterItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/OrchestrationParameterItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/ViewpointContainerItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/ViewpointContainerItemProvider.java
index bb0d44a..d79907f 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/ViewpointContainerItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/ViewpointContainerItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/ViewpointItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/ViewpointItemProvider.java
index 90c6441..077ff89 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/ViewpointItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/fcore/provider/ViewpointItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/mapping/provider/MappingDomainItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/mapping/provider/MappingDomainItemProvider.java
index fe08fb5..2c9a8b3 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/mapping/provider/MappingDomainItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/mapping/provider/MappingDomainItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/mapping/provider/MappingItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/mapping/provider/MappingItemProvider.java
index b3c16cc..de2f65f 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/mapping/provider/MappingItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/mapping/provider/MappingItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/mapping/provider/MappingItemProviderAdapterFactory.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/mapping/provider/MappingItemProviderAdapterFactory.java
index 4159e82..01336f8 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/mapping/provider/MappingItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/mapping/provider/MappingItemProviderAdapterFactory.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/mapping/provider/MappingViewpointItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/mapping/provider/MappingViewpointItemProvider.java
index 9feec26..1b1560c 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/mapping/provider/MappingViewpointItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/mapping/provider/MappingViewpointItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/AbstractPatternCallItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/AbstractPatternCallItemProvider.java
index b6fb4a1..540f71a 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/AbstractPatternCallItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/AbstractPatternCallItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/BackCallItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/BackCallItemProvider.java
index 3421774..773bed7 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/BackCallItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/BackCallItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/BasicQueryItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/BasicQueryItemProvider.java
index 483be74..1a9afd3 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/BasicQueryItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/BasicQueryItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/CallItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/CallItemProvider.java
index 47384fa..a8258a1 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/CallItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/CallItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/CustomQueryItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/CustomQueryItemProvider.java
index 96ee86f..1bb8006 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/CustomQueryItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/CustomQueryItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/MethodCallItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/MethodCallItemProvider.java
index e51fdf2..ca5b974 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/MethodCallItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/MethodCallItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/Paramerter2ParameterMapItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/Paramerter2ParameterMapItemProvider.java
index 31030fc..1720ca2 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/Paramerter2ParameterMapItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/Paramerter2ParameterMapItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternCallItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternCallItemProvider.java
index c05f75a..9bd5a9b 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternCallItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternCallItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternElementItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternElementItemProvider.java
index 13519d1..0d4d1f2 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternElementItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternElementItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternInjectedCallItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternInjectedCallItemProvider.java
index 8f9622d..8250341 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternInjectedCallItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternInjectedCallItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternItemProvider.java
index f3c6843..953fc39 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternItemProviderAdapterFactory.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternItemProviderAdapterFactory.java
index 572c283..4424df6 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternItemProviderAdapterFactory.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternLibraryItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternLibraryItemProvider.java
index e5422df..3b8b8cb 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternLibraryItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternLibraryItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternMethodItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternMethodItemProvider.java
index d86671c..55b44be 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternMethodItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternMethodItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternNatureItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternNatureItemProvider.java
index a69c9d5..ade4e72 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternNatureItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternNatureItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternParameterItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternParameterItemProvider.java
index 329e783..60b4054 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternParameterItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternParameterItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternVariableItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternVariableItemProvider.java
index 978e5e8..2f1392e 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternVariableItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternVariableItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternViewpointItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternViewpointItemProvider.java
index 14c87c28..b068550 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternViewpointItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/PatternViewpointItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/QueryItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/QueryItemProvider.java
index 0c09500..a9f2251 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/QueryItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/QueryItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/String2PatternListItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/String2PatternListItemProvider.java
index d987452..a23a687 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/String2PatternListItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/String2PatternListItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/String2StringItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/String2StringItemProvider.java
index ecb1337..4aba839 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/String2StringItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/String2StringItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/StringQueryItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/StringQueryItemProvider.java
index 92fdfa3..56fb21a 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/StringQueryItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/StringQueryItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/SubstitutionItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/SubstitutionItemProvider.java
index 0cec03b..815dcf2 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/SubstitutionItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/SubstitutionItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/SuperCallItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/SuperCallItemProvider.java
index e0866d3..2245b5f 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/SuperCallItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/SuperCallItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/TypePatternCallBackHandlerItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/TypePatternCallBackHandlerItemProvider.java
index 914fcbf..edd3231 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/TypePatternCallBackHandlerItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/TypePatternCallBackHandlerItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/TypePatternDomainVisitorItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/TypePatternDomainVisitorItemProvider.java
index 60d4aef..9a64164 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/TypePatternDomainVisitorItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/TypePatternDomainVisitorItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/TypePatternExecutionReporterItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/TypePatternExecutionReporterItemProvider.java
index 475f497..afd1623 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/TypePatternExecutionReporterItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/TypePatternExecutionReporterItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/TypePatternListItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/TypePatternListItemProvider.java
index 958273a..76a85bd 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/TypePatternListItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/TypePatternListItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/TypePatternOutputProcessorItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/TypePatternOutputProcessorItemProvider.java
index c972ce5..7a3c9e3 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/TypePatternOutputProcessorItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/TypePatternOutputProcessorItemProvider.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/TypePatternSubstitutionItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/TypePatternSubstitutionItemProvider.java
index 5a72d2b..c4d54cf 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/TypePatternSubstitutionItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/pattern/provider/TypePatternSubstitutionItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeAbstractClassItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeAbstractClassItemProvider.java
index 3aaf244..0361727 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeAbstractClassItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeAbstractClassItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeBigDecimalItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeBigDecimalItemProvider.java
index 20d65f3..a0feea0 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeBigDecimalItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeBigDecimalItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeBigIntegerItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeBigIntegerItemProvider.java
index 9e45583..22f861d 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeBigIntegerItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeBigIntegerItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeBooleanItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeBooleanItemProvider.java
index 1308179..9b07aba 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeBooleanItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeBooleanItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeByteItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeByteItemProvider.java
index 62a85ca..fa78937 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeByteItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeByteItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeCharacterItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeCharacterItemProvider.java
index 3a08926..6d7dd3a 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeCharacterItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeCharacterItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeClassItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeClassItemProvider.java
index a679caf..8f1d502 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeClassItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeClassItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeCollectionItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeCollectionItemProvider.java
index fb2c5e1..7394e9f 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeCollectionItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeCollectionItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

 O * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeDateItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeDateItemProvider.java
index c055860..0a7e9f5 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeDateItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeDateItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeDoubleItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeDoubleItemProvider.java
index 3199cd9..5cca184 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeDoubleItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeDoubleItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeElementItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeElementItemProvider.java
index 4be6aa6..a14a0ff 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeElementItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeElementItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeFloatItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeFloatItemProvider.java
index 34942d2..94411e2 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeFloatItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeFloatItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeIntegerItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeIntegerItemProvider.java
index c2ddad6..3235bc7 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeIntegerItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeIntegerItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeItemProvider.java
index 2857dfc..cb0cb0c 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeListItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeListItemProvider.java
index 9b87d2b..b34c21b 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeListItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeListItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeLongItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeLongItemProvider.java
index ed9a142..13e01a6 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeLongItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeLongItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeMapItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeMapItemProvider.java
index fcdb43c..5c5d68a 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeMapItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeMapItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeObjectItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeObjectItemProvider.java
index 948c4bf..de9fad4 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeObjectItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeObjectItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeSetItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeSetItemProvider.java
index 71df443..4e0d4fb 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeSetItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeSetItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeShortItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeShortItemProvider.java
index c4a3d0a..9e900ad 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeShortItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeShortItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeStringItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeStringItemProvider.java
index 13bb680..963e7be 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeStringItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeStringItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeURIItemProvider.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeURIItemProvider.java
index 2f9e53f..21f05f9 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeURIItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypeURIItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypesItemProviderAdapterFactory.java b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypesItemProviderAdapterFactory.java
index 5b009a5..b0d8777 100644
--- a/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypesItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.egf.model.edit/generated/org/eclipse/egf/model/types/provider/TypesItemProviderAdapterFactory.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/plugin.properties b/plugins/org.eclipse.egf.model.edit/plugin.properties
index 800fa77..c3ff0fe 100644
--- a/plugins/org.eclipse.egf.model.edit/plugin.properties
+++ b/plugins/org.eclipse.egf.model.edit/plugin.properties
Binary files differ
diff --git a/plugins/org.eclipse.egf.model.edit/plugin.xml b/plugins/org.eclipse.egf.model.edit/plugin.xml
index 6fc41bc..2d01aa6 100644
--- a/plugins/org.eclipse.egf.model.edit/plugin.xml
+++ b/plugins/org.eclipse.egf.model.edit/plugin.xml
@@ -3,10 +3,12 @@
 

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/edit/l10n/EGFModelEditMessages.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/edit/l10n/EGFModelEditMessages.java
index 4bdf1dc..406f16d 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/edit/l10n/EGFModelEditMessages.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/edit/l10n/EGFModelEditMessages.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2000, 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

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * IBM Corporation - initial API and implementation

  * Thales Corporate Services S.A.S

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/edit/l10n/messages.properties b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/edit/l10n/messages.properties
index a1a051b..c9b1205 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/edit/l10n/messages.properties
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/edit/l10n/messages.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/ActivitySetCommand.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/ActivitySetCommand.java
index 13fef01..d2e1086 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/ActivitySetCommand.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/ActivitySetCommand.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/ContractContainerAddCommand.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/ContractContainerAddCommand.java
index f21e274..c0134cf 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/ContractContainerAddCommand.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/ContractContainerAddCommand.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/FactoryComponentSetViewpointContainerCommand.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/FactoryComponentSetViewpointContainerCommand.java
index a95d2aa..b5cc4a5 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/FactoryComponentSetViewpointContainerCommand.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/FactoryComponentSetViewpointContainerCommand.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/InvocationSetInvokedActivityCommand.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/InvocationSetInvokedActivityCommand.java
index b3006ed..a1393c3 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/InvocationSetInvokedActivityCommand.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/InvocationSetInvokedActivityCommand.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/RemoveInvocationContractContainerInvocationContracts.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/RemoveInvocationContractContainerInvocationContracts.java
index 5498b56..353f830 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/RemoveInvocationContractContainerInvocationContracts.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/RemoveInvocationContractContainerInvocationContracts.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/ViewpointContainerAddCommand.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/ViewpointContainerAddCommand.java
index 966e37d..6d20b68 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/ViewpointContainerAddCommand.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/ViewpointContainerAddCommand.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/resource/FcoreDragAndDropCommand.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/resource/FcoreDragAndDropCommand.java
index 1473d0e..b6ddebb 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/resource/FcoreDragAndDropCommand.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/resource/FcoreDragAndDropCommand.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/resource/FcoreResourceAddCommand.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/resource/FcoreResourceAddCommand.java
index a74088e..f0b6afa 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/resource/FcoreResourceAddCommand.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/resource/FcoreResourceAddCommand.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2000, 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

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/resource/FcoreResourcePasteFromClipboardCommand.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/resource/FcoreResourcePasteFromClipboardCommand.java
index 4f35204..00bcd9f 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/resource/FcoreResourcePasteFromClipboardCommand.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/resource/FcoreResourcePasteFromClipboardCommand.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2000, 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

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/resource/ResourceFeatureAddCommand.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/resource/ResourceFeatureAddCommand.java
index 5caf947..7234e8f 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/resource/ResourceFeatureAddCommand.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/resource/ResourceFeatureAddCommand.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/resource/ResourceMoveCommand.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/resource/ResourceMoveCommand.java
index 5159edc..d445d55 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/resource/ResourceMoveCommand.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/resource/ResourceMoveCommand.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/resource/ResourceRemoveCommand.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/resource/ResourceRemoveCommand.java
index 9d72a5c..6401968 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/resource/ResourceRemoveCommand.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/commands/resource/ResourceRemoveCommand.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/helper/FactoryComponentContractHelper.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/helper/FactoryComponentContractHelper.java
index 9da44fe..18f1854 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/helper/FactoryComponentContractHelper.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/helper/FactoryComponentContractHelper.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/helper/InvocationContractHelper.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/helper/InvocationContractHelper.java
index d842a1b..7978a99 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/helper/InvocationContractHelper.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/helper/InvocationContractHelper.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/helper/OrchestrationParameterHelper.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/helper/OrchestrationParameterHelper.java
index a66a3f8..7713483 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/helper/OrchestrationParameterHelper.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/helper/OrchestrationParameterHelper.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/provider/FcoreCustomItemProviderAdapterFactory.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/provider/FcoreCustomItemProviderAdapterFactory.java
index ad2d783..e2772eb 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/provider/FcoreCustomItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/provider/FcoreCustomItemProviderAdapterFactory.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/provider/FcoreResourceItemProvider.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/provider/FcoreResourceItemProvider.java
index 1ca0d65..390efe6 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/provider/FcoreResourceItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/provider/FcoreResourceItemProvider.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/provider/FcoreResourceItemProviderAdapterFactory.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/provider/FcoreResourceItemProviderAdapterFactory.java
index 29ff4cc..bb16359 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/provider/FcoreResourceItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/provider/FcoreResourceItemProviderAdapterFactory.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/provider/IResourceChildCreationExtender.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/provider/IResourceChildCreationExtender.java
index fceb76f..11c5878 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/provider/IResourceChildCreationExtender.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/provider/IResourceChildCreationExtender.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/provider/InvocationContractCustomItemProvider.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/provider/InvocationContractCustomItemProvider.java
index b42c4d6..959722c 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/provider/InvocationContractCustomItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/provider/InvocationContractCustomItemProvider.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/provider/ResourceChildCreationExtenderManager.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/provider/ResourceChildCreationExtenderManager.java
index 01e7e64..c9b9472 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/provider/ResourceChildCreationExtenderManager.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/fcore/provider/ResourceChildCreationExtenderManager.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * 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

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM - Initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternAddPatternMethodCommand.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternAddPatternMethodCommand.java
index 0d7fda0..7172878 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternAddPatternMethodCommand.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternAddPatternMethodCommand.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternCopyCommand.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternCopyCommand.java
index 2aba86b..e9f30a7 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternCopyCommand.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternCopyCommand.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternCreateCopyCommand.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternCreateCopyCommand.java
index 46aa7b2..6b8e124 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternCreateCopyCommand.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternCreateCopyCommand.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternLibraryAddPatternCommand.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternLibraryAddPatternCommand.java
index fc0fe19..879f974 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternLibraryAddPatternCommand.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternLibraryAddPatternCommand.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternLibraryRemovePatternCommand.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternLibraryRemovePatternCommand.java
index ae1a3ad..829734b 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternLibraryRemovePatternCommand.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternLibraryRemovePatternCommand.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternRemovePatternMethodCommand.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternRemovePatternMethodCommand.java
index d30f857..168faa5 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternRemovePatternMethodCommand.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternRemovePatternMethodCommand.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternViewpointAddCommand.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternViewpointAddCommand.java
index b46f409..aa08549 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternViewpointAddCommand.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/commands/PatternViewpointAddCommand.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/provider/PatternCustomItemProvider.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/provider/PatternCustomItemProvider.java
index 98816c0..de3529c 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/provider/PatternCustomItemProvider.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/provider/PatternCustomItemProvider.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
  */
diff --git a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/provider/PatternCustomItemProviderAdapterFactory.java b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/provider/PatternCustomItemProviderAdapterFactory.java
index 650f819..5094fe3 100644
--- a/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/provider/PatternCustomItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.egf.model.edit/src/org/eclipse/egf/model/pattern/provider/PatternCustomItemProviderAdapterFactory.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.editor/build.properties b/plugins/org.eclipse.egf.model.editor/build.properties
index 67be8c2..682764d 100644
--- a/plugins/org.eclipse.egf.model.editor/build.properties
+++ b/plugins/org.eclipse.egf.model.editor/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.editor/generated/org/eclipse/egf/model/editor/EGFModelEditorPlugin.java b/plugins/org.eclipse.egf.model.editor/generated/org/eclipse/egf/model/editor/EGFModelEditorPlugin.java
index 13a03cf..ce394e9 100644
--- a/plugins/org.eclipse.egf.model.editor/generated/org/eclipse/egf/model/editor/EGFModelEditorPlugin.java
+++ b/plugins/org.eclipse.egf.model.editor/generated/org/eclipse/egf/model/editor/EGFModelEditorPlugin.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.editor/generated/org/eclipse/egf/model/fcore/presentation/FcoreActionBarContributor.java b/plugins/org.eclipse.egf.model.editor/generated/org/eclipse/egf/model/fcore/presentation/FcoreActionBarContributor.java
index ad59143..3f4e923 100644
--- a/plugins/org.eclipse.egf.model.editor/generated/org/eclipse/egf/model/fcore/presentation/FcoreActionBarContributor.java
+++ b/plugins/org.eclipse.egf.model.editor/generated/org/eclipse/egf/model/fcore/presentation/FcoreActionBarContributor.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.editor/generated/org/eclipse/egf/model/fcore/presentation/FcoreEditor.java b/plugins/org.eclipse.egf.model.editor/generated/org/eclipse/egf/model/fcore/presentation/FcoreEditor.java
index 204dff1..6eec495 100644
--- a/plugins/org.eclipse.egf.model.editor/generated/org/eclipse/egf/model/fcore/presentation/FcoreEditor.java
+++ b/plugins/org.eclipse.egf.model.editor/generated/org/eclipse/egf/model/fcore/presentation/FcoreEditor.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model.editor/generated/org/eclipse/egf/model/fcore/presentation/FcoreModelWizard.java b/plugins/org.eclipse.egf.model.editor/generated/org/eclipse/egf/model/fcore/presentation/FcoreModelWizard.java
index 6809a18..94df9e3 100644
--- a/plugins/org.eclipse.egf.model.editor/generated/org/eclipse/egf/model/fcore/presentation/FcoreModelWizard.java
+++ b/plugins/org.eclipse.egf.model.editor/generated/org/eclipse/egf/model/fcore/presentation/FcoreModelWizard.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.editor/plugin.properties b/plugins/org.eclipse.egf.model.editor/plugin.properties
index a9572d3..89cc956 100644
--- a/plugins/org.eclipse.egf.model.editor/plugin.properties
+++ b/plugins/org.eclipse.egf.model.editor/plugin.properties
@@ -2,10 +2,13 @@
 # <copyright>

 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/actions/OpenActivityAction.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/actions/OpenActivityAction.java
index afd94cf..6cc746a 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/actions/OpenActivityAction.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/actions/OpenActivityAction.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/adapter/ModelElementBundleAdapter.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/adapter/ModelElementBundleAdapter.java
index 44f625e..6dc9f8f 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/adapter/ModelElementBundleAdapter.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/adapter/ModelElementBundleAdapter.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/commands/InvokeActivityCommand.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/commands/InvokeActivityCommand.java
index 00786d2..da333e8 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/commands/InvokeActivityCommand.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/commands/InvokeActivityCommand.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/AbstractTypeEditorContributor.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/AbstractTypeEditorContributor.java
index 94512a0..9583dfa 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/AbstractTypeEditorContributor.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/AbstractTypeEditorContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/DomainEditorContributor.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/DomainEditorContributor.java
index cf754ac..44c312c 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/DomainEditorContributor.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/DomainEditorContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/EMFDomainEditorContributor.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/EMFDomainEditorContributor.java
index 1b7083f..9afa92e 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/EMFDomainEditorContributor.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/EMFDomainEditorContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/FilesystemDomainEditorContributor.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/FilesystemDomainEditorContributor.java
index ccad79d..ce4e4fd 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/FilesystemDomainEditorContributor.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/FilesystemDomainEditorContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/InvocationEditorContributor.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/InvocationEditorContributor.java
index 548ce56..0a567c1 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/InvocationEditorContributor.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/InvocationEditorContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/InvokeActivityMenuContributor.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/InvokeActivityMenuContributor.java
index 7224540..64ef5b0 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/InvokeActivityMenuContributor.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/InvokeActivityMenuContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/NullableDialogCellEditor.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/NullableDialogCellEditor.java
index 252677c..0d31dbb 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/NullableDialogCellEditor.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/NullableDialogCellEditor.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenActivityListenerContributor.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenActivityListenerContributor.java
index ce3b0d4..0711653 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenActivityListenerContributor.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenActivityListenerContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenActivityMenuContributor.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenActivityMenuContributor.java
index 1701adb..e35ec76 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenActivityMenuContributor.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenActivityMenuContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenEObjectMenuContributor.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenEObjectMenuContributor.java
index 3135fa2..39781da 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenEObjectMenuContributor.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenEObjectMenuContributor.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenInvocationContractListenerContributor.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenInvocationContractListenerContributor.java
index 142c2ee..533e610 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenInvocationContractListenerContributor.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenInvocationContractListenerContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenInvocationContractMenuContributor.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenInvocationContractMenuContributor.java
index 5739b95..4471b83 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenInvocationContractMenuContributor.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenInvocationContractMenuContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenSuperTaskMenuContributor.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenSuperTaskMenuContributor.java
index 601f648..50e2211 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenSuperTaskMenuContributor.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenSuperTaskMenuContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenURIListenerContributor.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenURIListenerContributor.java
index 2dda199..7457df6 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenURIListenerContributor.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenURIListenerContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenURIMenuContributor.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenURIMenuContributor.java
index 3130387..7530e52 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenURIMenuContributor.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/OpenURIMenuContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/SuperTaskEditorContributor.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/SuperTaskEditorContributor.java
index 5e1aba1..e9a1c8f 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/SuperTaskEditorContributor.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/SuperTaskEditorContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/TypeClassEditorContributor.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/TypeClassEditorContributor.java
index 668d66f..b821fa4 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/TypeClassEditorContributor.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/TypeClassEditorContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/TypeEditorContributor.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/TypeEditorContributor.java
index 9cc3cf0..fc6db1c 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/TypeEditorContributor.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/TypeEditorContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/TypeURIEditorContributor.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/TypeURIEditorContributor.java
index 2dc9d33..63fedf1 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/TypeURIEditorContributor.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/TypeURIEditorContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/WorkspaceDomainEditorContributor.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/WorkspaceDomainEditorContributor.java
index 5de9c39..02fab12 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/WorkspaceDomainEditorContributor.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/contributions/WorkspaceDomainEditorContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/dialogs/ActivitySelectionDialog.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/dialogs/ActivitySelectionDialog.java
index 5932ce8..697c4d6 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/dialogs/ActivitySelectionDialog.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/dialogs/ActivitySelectionDialog.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/dialogs/ContractSelectionDialog.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/dialogs/ContractSelectionDialog.java
index 24e1be0..609c9a1 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/dialogs/ContractSelectionDialog.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/dialogs/ContractSelectionDialog.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/dialogs/DelegatedWizardDialog.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/dialogs/DelegatedWizardDialog.java
index 3405589..18d8f4c 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/dialogs/DelegatedWizardDialog.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/dialogs/DelegatedWizardDialog.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/dialogs/FactoryComponentSelectionDialog.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/dialogs/FactoryComponentSelectionDialog.java
index 7241666..c10c5d8 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/dialogs/FactoryComponentSelectionDialog.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/dialogs/FactoryComponentSelectionDialog.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/dialogs/TaskSelectionDialog.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/dialogs/TaskSelectionDialog.java
index daa1e86..03d47d2 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/dialogs/TaskSelectionDialog.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/dialogs/TaskSelectionDialog.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/l10n/ModelEditorMessages.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/l10n/ModelEditorMessages.java
index 1e03021..dfed2ea 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/l10n/ModelEditorMessages.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/l10n/ModelEditorMessages.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/l10n/messages.properties b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/l10n/messages.properties
index 5f54936..7ade357 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/l10n/messages.properties
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/l10n/messages.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/provider/FcoreContentProvider.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/provider/FcoreContentProvider.java
index f36977b..a7311e9 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/provider/FcoreContentProvider.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/provider/FcoreContentProvider.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/provider/FcorePropertyDescriptor.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/provider/FcorePropertyDescriptor.java
index a647e4a..7d2816f 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/provider/FcorePropertyDescriptor.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/provider/FcorePropertyDescriptor.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/provider/FcorePropertySheetPage.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/provider/FcorePropertySheetPage.java
index 4cd722a..2ee56fb 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/provider/FcorePropertySheetPage.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/provider/FcorePropertySheetPage.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/provider/FcorePropertySource.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/provider/FcorePropertySource.java
index 687c81b..89b77bf 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/provider/FcorePropertySource.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/provider/FcorePropertySource.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/wizards/ActivitySelectionPage.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/wizards/ActivitySelectionPage.java
index 23c5124..c2ce089 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/wizards/ActivitySelectionPage.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/wizards/ActivitySelectionPage.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/wizards/ContractSelectionPage.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/wizards/ContractSelectionPage.java
index 4724c58..a286518 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/wizards/ContractSelectionPage.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/wizards/ContractSelectionPage.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/wizards/InvokeActivityWizard.java b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/wizards/InvokeActivityWizard.java
index e0c2ba2..64e2e49 100644
--- a/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/wizards/InvokeActivityWizard.java
+++ b/plugins/org.eclipse.egf.model.editor/src/org/eclipse/egf/model/editor/wizards/InvokeActivityWizard.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.fprod.edit/build.properties b/plugins/org.eclipse.egf.model.fprod.edit/build.properties
index ea05076..1bfada2 100644
--- a/plugins/org.eclipse.egf.model.fprod.edit/build.properties
+++ b/plugins/org.eclipse.egf.model.fprod.edit/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.fprod.edit/generated/org/eclipse/egf/model/edit/EGFFprodEditPlugin.java b/plugins/org.eclipse.egf.model.fprod.edit/generated/org/eclipse/egf/model/edit/EGFFprodEditPlugin.java
index b1115d1..6a19529 100644
--- a/plugins/org.eclipse.egf.model.fprod.edit/generated/org/eclipse/egf/model/edit/EGFFprodEditPlugin.java
+++ b/plugins/org.eclipse.egf.model.fprod.edit/generated/org/eclipse/egf/model/edit/EGFFprodEditPlugin.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.fprod.edit/generated/org/eclipse/egf/model/fprod/provider/FprodItemProviderAdapterFactory.java b/plugins/org.eclipse.egf.model.fprod.edit/generated/org/eclipse/egf/model/fprod/provider/FprodItemProviderAdapterFactory.java
index 1e6e68d..6ea722e 100644
--- a/plugins/org.eclipse.egf.model.fprod.edit/generated/org/eclipse/egf/model/fprod/provider/FprodItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.egf.model.fprod.edit/generated/org/eclipse/egf/model/fprod/provider/FprodItemProviderAdapterFactory.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.fprod.edit/generated/org/eclipse/egf/model/fprod/provider/ProductionPlanInvocationItemProvider.java b/plugins/org.eclipse.egf.model.fprod.edit/generated/org/eclipse/egf/model/fprod/provider/ProductionPlanInvocationItemProvider.java
index db59121..2f9a088 100644
--- a/plugins/org.eclipse.egf.model.fprod.edit/generated/org/eclipse/egf/model/fprod/provider/ProductionPlanInvocationItemProvider.java
+++ b/plugins/org.eclipse.egf.model.fprod.edit/generated/org/eclipse/egf/model/fprod/provider/ProductionPlanInvocationItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.fprod.edit/generated/org/eclipse/egf/model/fprod/provider/ProductionPlanItemProvider.java b/plugins/org.eclipse.egf.model.fprod.edit/generated/org/eclipse/egf/model/fprod/provider/ProductionPlanItemProvider.java
index 63ae5ef..61ebe58 100644
--- a/plugins/org.eclipse.egf.model.fprod.edit/generated/org/eclipse/egf/model/fprod/provider/ProductionPlanItemProvider.java
+++ b/plugins/org.eclipse.egf.model.fprod.edit/generated/org/eclipse/egf/model/fprod/provider/ProductionPlanItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.fprod.edit/plugin.properties b/plugins/org.eclipse.egf.model.fprod.edit/plugin.properties
index dc25f1c..d902f29 100644
--- a/plugins/org.eclipse.egf.model.fprod.edit/plugin.properties
+++ b/plugins/org.eclipse.egf.model.fprod.edit/plugin.properties
Binary files differ
diff --git a/plugins/org.eclipse.egf.model.fprod.edit/src/org/eclipse/egf/model/fprod/provider/FprodCustomItemProviderAdapterFactory.java b/plugins/org.eclipse.egf.model.fprod.edit/src/org/eclipse/egf/model/fprod/provider/FprodCustomItemProviderAdapterFactory.java
index a623178..572d2b3 100644
--- a/plugins/org.eclipse.egf.model.fprod.edit/src/org/eclipse/egf/model/fprod/provider/FprodCustomItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.egf.model.fprod.edit/src/org/eclipse/egf/model/fprod/provider/FprodCustomItemProviderAdapterFactory.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.fprod.edit/src/org/eclipse/egf/model/fprod/provider/ProductionPlanInvocationCustomItemProvider.java b/plugins/org.eclipse.egf.model.fprod.edit/src/org/eclipse/egf/model/fprod/provider/ProductionPlanInvocationCustomItemProvider.java
index 9a70316..12f6648 100644
--- a/plugins/org.eclipse.egf.model.fprod.edit/src/org/eclipse/egf/model/fprod/provider/ProductionPlanInvocationCustomItemProvider.java
+++ b/plugins/org.eclipse.egf.model.fprod.edit/src/org/eclipse/egf/model/fprod/provider/ProductionPlanInvocationCustomItemProvider.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.fprod/build.properties b/plugins/org.eclipse.egf.model.fprod/build.properties
index 9e1be25..20056bb 100644
--- a/plugins/org.eclipse.egf.model.fprod/build.properties
+++ b/plugins/org.eclipse.egf.model.fprod/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/EGFFprodPlugin.java b/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/EGFFprodPlugin.java
index ca51c1f..d58417b 100644
--- a/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/EGFFprodPlugin.java
+++ b/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/EGFFprodPlugin.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/FprodFactory.java b/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/FprodFactory.java
index 25a12ee..97984d4 100644
--- a/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/FprodFactory.java
+++ b/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/FprodFactory.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/FprodPackage.java b/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/FprodPackage.java
index c9c3f17..4db8983 100644
--- a/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/FprodPackage.java
+++ b/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/FprodPackage.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/ProductionPlan.java b/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/ProductionPlan.java
index f339e8c..469d9af 100644
--- a/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/ProductionPlan.java
+++ b/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/ProductionPlan.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/ProductionPlanInvocation.java b/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/ProductionPlanInvocation.java
index 7a38cad..400d775 100644
--- a/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/ProductionPlanInvocation.java
+++ b/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/ProductionPlanInvocation.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/impl/FprodFactoryImpl.java b/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/impl/FprodFactoryImpl.java
index 9ae95b3..bb097e3 100644
--- a/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/impl/FprodFactoryImpl.java
+++ b/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/impl/FprodFactoryImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/impl/FprodPackageImpl.java b/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/impl/FprodPackageImpl.java
index d682758..66a4a7e 100644
--- a/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/impl/FprodPackageImpl.java
+++ b/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/impl/FprodPackageImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/impl/ProductionPlanImpl.java b/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/impl/ProductionPlanImpl.java
index 668d5b5..4e842e3 100644
--- a/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/impl/ProductionPlanImpl.java
+++ b/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/impl/ProductionPlanImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/impl/ProductionPlanInvocationImpl.java b/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/impl/ProductionPlanInvocationImpl.java
index 12b6f62..e4bb40c 100644
--- a/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/impl/ProductionPlanInvocationImpl.java
+++ b/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/impl/ProductionPlanInvocationImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/util/FprodAdapterFactory.java b/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/util/FprodAdapterFactory.java
index b67792e..199d41e 100644
--- a/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/util/FprodAdapterFactory.java
+++ b/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/util/FprodAdapterFactory.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/util/FprodSwitch.java b/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/util/FprodSwitch.java
index f2b6b7e..f6f4b93 100644
--- a/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/util/FprodSwitch.java
+++ b/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/util/FprodSwitch.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/util/FprodValidator.java b/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/util/FprodValidator.java
index 73df5d9..794504f 100644
--- a/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/util/FprodValidator.java
+++ b/plugins/org.eclipse.egf.model.fprod/generated/org/eclipse/egf/model/fprod/util/FprodValidator.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.fprod/plugin.properties b/plugins/org.eclipse.egf.model.fprod/plugin.properties
index 9ea43db..9cfad66 100644
--- a/plugins/org.eclipse.egf.model.fprod/plugin.properties
+++ b/plugins/org.eclipse.egf.model.fprod/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.fprod/src/org/eclipse/egf/model/fprod/adapter/ProductionPlanInvocationAdapter.java b/plugins/org.eclipse.egf.model.fprod/src/org/eclipse/egf/model/fprod/adapter/ProductionPlanInvocationAdapter.java
index 6324fc7..f926472 100644
--- a/plugins/org.eclipse.egf.model.fprod/src/org/eclipse/egf/model/fprod/adapter/ProductionPlanInvocationAdapter.java
+++ b/plugins/org.eclipse.egf.model.fprod/src/org/eclipse/egf/model/fprod/adapter/ProductionPlanInvocationAdapter.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.ftask.edit/build.properties b/plugins/org.eclipse.egf.model.ftask.edit/build.properties
index 04dfe48..1ddf4d2 100644
--- a/plugins/org.eclipse.egf.model.ftask.edit/build.properties
+++ b/plugins/org.eclipse.egf.model.ftask.edit/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.ftask.edit/generated/org/eclipse/egf/model/edit/EGFFtaskEditPlugin.java b/plugins/org.eclipse.egf.model.ftask.edit/generated/org/eclipse/egf/model/edit/EGFFtaskEditPlugin.java
index a516177..00c1191 100644
--- a/plugins/org.eclipse.egf.model.ftask.edit/generated/org/eclipse/egf/model/edit/EGFFtaskEditPlugin.java
+++ b/plugins/org.eclipse.egf.model.ftask.edit/generated/org/eclipse/egf/model/edit/EGFFtaskEditPlugin.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.ftask.edit/generated/org/eclipse/egf/model/ftask/provider/FtaskItemProviderAdapterFactory.java b/plugins/org.eclipse.egf.model.ftask.edit/generated/org/eclipse/egf/model/ftask/provider/FtaskItemProviderAdapterFactory.java
index cc141fa..9f5bd06 100644
--- a/plugins/org.eclipse.egf.model.ftask.edit/generated/org/eclipse/egf/model/ftask/provider/FtaskItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.egf.model.ftask.edit/generated/org/eclipse/egf/model/ftask/provider/FtaskItemProviderAdapterFactory.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.ftask.edit/generated/org/eclipse/egf/model/ftask/provider/TaskItemProvider.java b/plugins/org.eclipse.egf.model.ftask.edit/generated/org/eclipse/egf/model/ftask/provider/TaskItemProvider.java
index ce8dffb..f64e842 100644
--- a/plugins/org.eclipse.egf.model.ftask.edit/generated/org/eclipse/egf/model/ftask/provider/TaskItemProvider.java
+++ b/plugins/org.eclipse.egf.model.ftask.edit/generated/org/eclipse/egf/model/ftask/provider/TaskItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.ftask.edit/plugin.properties b/plugins/org.eclipse.egf.model.ftask.edit/plugin.properties
index fef93aa..aca3a50 100644
--- a/plugins/org.eclipse.egf.model.ftask.edit/plugin.properties
+++ b/plugins/org.eclipse.egf.model.ftask.edit/plugin.properties
@@ -1,10 +1,13 @@
 

 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.ftask.edit/src/org/eclipse/egf/model/ftask/provider/FcoreResourceChildCreationExtender.java b/plugins/org.eclipse.egf.model.ftask.edit/src/org/eclipse/egf/model/ftask/provider/FcoreResourceChildCreationExtender.java
index cf76094..3acf254 100644
--- a/plugins/org.eclipse.egf.model.ftask.edit/src/org/eclipse/egf/model/ftask/provider/FcoreResourceChildCreationExtender.java
+++ b/plugins/org.eclipse.egf.model.ftask.edit/src/org/eclipse/egf/model/ftask/provider/FcoreResourceChildCreationExtender.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.ftask/build.properties b/plugins/org.eclipse.egf.model.ftask/build.properties
index 7281526..31286d6 100644
--- a/plugins/org.eclipse.egf.model.ftask/build.properties
+++ b/plugins/org.eclipse.egf.model.ftask/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/EGFFtaskPlugin.java b/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/EGFFtaskPlugin.java
index 91e3f72..62ebb05 100644
--- a/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/EGFFtaskPlugin.java
+++ b/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/EGFFtaskPlugin.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/FtaskFactory.java b/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/FtaskFactory.java
index c2ceef0..0b013b8 100644
--- a/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/FtaskFactory.java
+++ b/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/FtaskFactory.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/FtaskPackage.java b/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/FtaskPackage.java
index 789248a..1d4ed90 100644
--- a/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/FtaskPackage.java
+++ b/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/FtaskPackage.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/Task.java b/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/Task.java
index e2c071b..45e5d6d 100644
--- a/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/Task.java
+++ b/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/Task.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/impl/FtaskFactoryImpl.java b/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/impl/FtaskFactoryImpl.java
index d731394..31bf584 100644
--- a/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/impl/FtaskFactoryImpl.java
+++ b/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/impl/FtaskFactoryImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/impl/FtaskPackageImpl.java b/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/impl/FtaskPackageImpl.java
index ee7d78a..f5c3e2e 100644
--- a/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/impl/FtaskPackageImpl.java
+++ b/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/impl/FtaskPackageImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/impl/TaskImpl.java b/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/impl/TaskImpl.java
index cdf8169..f532bf5 100644
--- a/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/impl/TaskImpl.java
+++ b/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/impl/TaskImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/util/FtaskAdapterFactory.java b/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/util/FtaskAdapterFactory.java
index 9baa493..0a5f1d2 100644
--- a/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/util/FtaskAdapterFactory.java
+++ b/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/util/FtaskAdapterFactory.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/util/FtaskSwitch.java b/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/util/FtaskSwitch.java
index f2e682c..9cba186 100644
--- a/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/util/FtaskSwitch.java
+++ b/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/util/FtaskSwitch.java
@@ -1,10 +1,12 @@
 /**

  * 

 O * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/util/FtaskValidator.java b/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/util/FtaskValidator.java
index e78dced..1ca806b 100644
--- a/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/util/FtaskValidator.java
+++ b/plugins/org.eclipse.egf.model.ftask/generated/org/eclipse/egf/model/ftask/util/FtaskValidator.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.ftask/plugin.properties b/plugins/org.eclipse.egf.model.ftask/plugin.properties
index ba02cbb..a163a95 100644
--- a/plugins/org.eclipse.egf.model.ftask/plugin.properties
+++ b/plugins/org.eclipse.egf.model.ftask/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/ftask/producer/context/ITaskProductionContext.java b/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/ftask/producer/context/ITaskProductionContext.java
index 58160ef..ec9e857 100644
--- a/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/ftask/producer/context/ITaskProductionContext.java
+++ b/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/ftask/producer/context/ITaskProductionContext.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/ftask/producer/invocation/ITaskProduction.java b/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/ftask/producer/invocation/ITaskProduction.java
index 5c20724..0ff25fb 100644
--- a/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/ftask/producer/invocation/ITaskProduction.java
+++ b/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/ftask/producer/invocation/ITaskProduction.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/ftask/producer/invocation/TaskProductionForRuby.java b/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/ftask/producer/invocation/TaskProductionForRuby.java
index 785c166..cb3c2be 100644
--- a/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/ftask/producer/invocation/TaskProductionForRuby.java
+++ b/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/ftask/producer/invocation/TaskProductionForRuby.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/helper/TaskValidationHelper.java b/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/helper/TaskValidationHelper.java
index 024408e..624486f 100644
--- a/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/helper/TaskValidationHelper.java
+++ b/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/helper/TaskValidationHelper.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/internal/registry/TaskNatureProxy.java b/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/internal/registry/TaskNatureProxy.java
index 185736e..184417e 100644
--- a/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/internal/registry/TaskNatureProxy.java
+++ b/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/internal/registry/TaskNatureProxy.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/internal/registry/TaskNatureRegistry.java b/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/internal/registry/TaskNatureRegistry.java
index 765d2f5..de26b45 100644
--- a/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/internal/registry/TaskNatureRegistry.java
+++ b/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/internal/registry/TaskNatureRegistry.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/l10n/EGFFtaskMessages.java b/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/l10n/EGFFtaskMessages.java
index fe03915..7a163f6 100644
--- a/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/l10n/EGFFtaskMessages.java
+++ b/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/l10n/EGFFtaskMessages.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/l10n/messages.properties b/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/l10n/messages.properties
index 70cb8ca2..afc2d72 100644
--- a/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/l10n/messages.properties
+++ b/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/l10n/messages.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/task/ITaskNature.java b/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/task/ITaskNature.java
index b054639..c220ba8 100644
--- a/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/task/ITaskNature.java
+++ b/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/task/ITaskNature.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/task/ITaskNatureRegistry.java b/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/task/ITaskNatureRegistry.java
index 79493dc..62373cb 100644
--- a/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/task/ITaskNatureRegistry.java
+++ b/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/task/ITaskNatureRegistry.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/task/ValidationInvocationException.java b/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/task/ValidationInvocationException.java
index e254c09..3088bf1 100644
--- a/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/task/ValidationInvocationException.java
+++ b/plugins/org.eclipse.egf.model.ftask/src/org/eclipse/egf/model/ftask/task/ValidationInvocationException.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.javapattern.edit/build.properties b/plugins/org.eclipse.egf.model.javapattern.edit/build.properties
index a25295d..32087b5 100644
--- a/plugins/org.eclipse.egf.model.javapattern.edit/build.properties
+++ b/plugins/org.eclipse.egf.model.javapattern.edit/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.javapattern.edit/generated/org/eclipse/egf/model/edit/EGFJavaPatternEditPlugin.java b/plugins/org.eclipse.egf.model.javapattern.edit/generated/org/eclipse/egf/model/edit/EGFJavaPatternEditPlugin.java
index f953046..7770f98 100644
--- a/plugins/org.eclipse.egf.model.javapattern.edit/generated/org/eclipse/egf/model/edit/EGFJavaPatternEditPlugin.java
+++ b/plugins/org.eclipse.egf.model.javapattern.edit/generated/org/eclipse/egf/model/edit/EGFJavaPatternEditPlugin.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.javapattern.edit/generated/org/eclipse/egf/model/javapattern/provider/JavaNatureItemProvider.java b/plugins/org.eclipse.egf.model.javapattern.edit/generated/org/eclipse/egf/model/javapattern/provider/JavaNatureItemProvider.java
index 78a34c5..bb1e1b5 100644
--- a/plugins/org.eclipse.egf.model.javapattern.edit/generated/org/eclipse/egf/model/javapattern/provider/JavaNatureItemProvider.java
+++ b/plugins/org.eclipse.egf.model.javapattern.edit/generated/org/eclipse/egf/model/javapattern/provider/JavaNatureItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.javapattern.edit/generated/org/eclipse/egf/model/javapattern/provider/JavaPatternItemProviderAdapterFactory.java b/plugins/org.eclipse.egf.model.javapattern.edit/generated/org/eclipse/egf/model/javapattern/provider/JavaPatternItemProviderAdapterFactory.java
index 333a21c..6ace95a 100644
--- a/plugins/org.eclipse.egf.model.javapattern.edit/generated/org/eclipse/egf/model/javapattern/provider/JavaPatternItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.egf.model.javapattern.edit/generated/org/eclipse/egf/model/javapattern/provider/JavaPatternItemProviderAdapterFactory.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.javapattern.edit/plugin.properties b/plugins/org.eclipse.egf.model.javapattern.edit/plugin.properties
index b629d51..01582af 100644
--- a/plugins/org.eclipse.egf.model.javapattern.edit/plugin.properties
+++ b/plugins/org.eclipse.egf.model.javapattern.edit/plugin.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.javapattern/build.properties b/plugins/org.eclipse.egf.model.javapattern/build.properties
index 509d65a..bff6254 100644
--- a/plugins/org.eclipse.egf.model.javapattern/build.properties
+++ b/plugins/org.eclipse.egf.model.javapattern/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/EGFJavaPatternPlugin.java b/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/EGFJavaPatternPlugin.java
index 7d54caf..19dda28 100644
--- a/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/EGFJavaPatternPlugin.java
+++ b/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/EGFJavaPatternPlugin.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/JavaNature.java b/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/JavaNature.java
index e4d4874..c5c09f6 100644
--- a/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/JavaNature.java
+++ b/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/JavaNature.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/JavaPatternFactory.java b/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/JavaPatternFactory.java
index c741a85..fb1bb50 100644
--- a/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/JavaPatternFactory.java
+++ b/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/JavaPatternFactory.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/JavaPatternPackage.java b/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/JavaPatternPackage.java
index ed1869e..c607ff3 100644
--- a/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/JavaPatternPackage.java
+++ b/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/JavaPatternPackage.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/impl/JavaNatureImpl.java b/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/impl/JavaNatureImpl.java
index 7237a18..1c66db9 100644
--- a/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/impl/JavaNatureImpl.java
+++ b/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/impl/JavaNatureImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/impl/JavaPatternFactoryImpl.java b/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/impl/JavaPatternFactoryImpl.java
index db579e7..73e2fb2 100644
--- a/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/impl/JavaPatternFactoryImpl.java
+++ b/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/impl/JavaPatternFactoryImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/impl/JavaPatternPackageImpl.java b/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/impl/JavaPatternPackageImpl.java
index e48f5d8..122cf20 100644
--- a/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/impl/JavaPatternPackageImpl.java
+++ b/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/impl/JavaPatternPackageImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/util/JavaPatternAdapterFactory.java b/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/util/JavaPatternAdapterFactory.java
index eb3d0ff..c287192 100644
--- a/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/util/JavaPatternAdapterFactory.java
+++ b/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/util/JavaPatternAdapterFactory.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/util/JavaPatternSwitch.java b/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/util/JavaPatternSwitch.java
index 7f77fd3..10ec9d0 100644
--- a/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/util/JavaPatternSwitch.java
+++ b/plugins/org.eclipse.egf.model.javapattern/generated/org/eclipse/egf/model/javapattern/util/JavaPatternSwitch.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.javapattern/plugin.properties b/plugins/org.eclipse.egf.model.javapattern/plugin.properties
index b6c1b0e..bc648a8 100644
--- a/plugins/org.eclipse.egf.model.javapattern/plugin.properties
+++ b/plugins/org.eclipse.egf.model.javapattern/plugin.properties
@@ -2,10 +2,13 @@
 # <copyright>

 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.jetpattern.edit/build.properties b/plugins/org.eclipse.egf.model.jetpattern.edit/build.properties
index a8a3ec9..d916546 100644
--- a/plugins/org.eclipse.egf.model.jetpattern.edit/build.properties
+++ b/plugins/org.eclipse.egf.model.jetpattern.edit/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.jetpattern.edit/generated/org/eclipse/egf/model/edit/EGFJetPatternEditPlugin.java b/plugins/org.eclipse.egf.model.jetpattern.edit/generated/org/eclipse/egf/model/edit/EGFJetPatternEditPlugin.java
index c17456c..476bd04 100644
--- a/plugins/org.eclipse.egf.model.jetpattern.edit/generated/org/eclipse/egf/model/edit/EGFJetPatternEditPlugin.java
+++ b/plugins/org.eclipse.egf.model.jetpattern.edit/generated/org/eclipse/egf/model/edit/EGFJetPatternEditPlugin.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.jetpattern.edit/generated/org/eclipse/egf/model/jetpattern/provider/JetNatureItemProvider.java b/plugins/org.eclipse.egf.model.jetpattern.edit/generated/org/eclipse/egf/model/jetpattern/provider/JetNatureItemProvider.java
index c02f575..81a2255 100644
--- a/plugins/org.eclipse.egf.model.jetpattern.edit/generated/org/eclipse/egf/model/jetpattern/provider/JetNatureItemProvider.java
+++ b/plugins/org.eclipse.egf.model.jetpattern.edit/generated/org/eclipse/egf/model/jetpattern/provider/JetNatureItemProvider.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.jetpattern.edit/generated/org/eclipse/egf/model/jetpattern/provider/JetPatternItemProviderAdapterFactory.java b/plugins/org.eclipse.egf.model.jetpattern.edit/generated/org/eclipse/egf/model/jetpattern/provider/JetPatternItemProviderAdapterFactory.java
index 8afc818..ec1f616 100644
--- a/plugins/org.eclipse.egf.model.jetpattern.edit/generated/org/eclipse/egf/model/jetpattern/provider/JetPatternItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.egf.model.jetpattern.edit/generated/org/eclipse/egf/model/jetpattern/provider/JetPatternItemProviderAdapterFactory.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.jetpattern.edit/plugin.properties b/plugins/org.eclipse.egf.model.jetpattern.edit/plugin.properties
index f30d2a4..2f7413e 100644
--- a/plugins/org.eclipse.egf.model.jetpattern.edit/plugin.properties
+++ b/plugins/org.eclipse.egf.model.jetpattern.edit/plugin.properties
@@ -2,10 +2,13 @@
 # <copyright>

 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.jetpattern/build.properties b/plugins/org.eclipse.egf.model.jetpattern/build.properties
index 9d8479a..00af555 100644
--- a/plugins/org.eclipse.egf.model.jetpattern/build.properties
+++ b/plugins/org.eclipse.egf.model.jetpattern/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/EGFJetPatternPlugin.java b/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/EGFJetPatternPlugin.java
index d361358..2454349 100644
--- a/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/EGFJetPatternPlugin.java
+++ b/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/EGFJetPatternPlugin.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/JetNature.java b/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/JetNature.java
index 450fefe..7ddd0ce 100644
--- a/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/JetNature.java
+++ b/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/JetNature.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/JetPatternFactory.java b/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/JetPatternFactory.java
index 78e6a81..14f42e1 100644
--- a/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/JetPatternFactory.java
+++ b/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/JetPatternFactory.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/JetPatternPackage.java b/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/JetPatternPackage.java
index da7eb35..43f10d0 100644
--- a/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/JetPatternPackage.java
+++ b/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/JetPatternPackage.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/impl/JetNatureImpl.java b/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/impl/JetNatureImpl.java
index 3e4b227..866fe35 100644
--- a/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/impl/JetNatureImpl.java
+++ b/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/impl/JetNatureImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/impl/JetPatternFactoryImpl.java b/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/impl/JetPatternFactoryImpl.java
index 0a9ccc0..02273f2 100644
--- a/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/impl/JetPatternFactoryImpl.java
+++ b/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/impl/JetPatternFactoryImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/impl/JetPatternPackageImpl.java b/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/impl/JetPatternPackageImpl.java
index ca8fa00..0a2a519 100644
--- a/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/impl/JetPatternPackageImpl.java
+++ b/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/impl/JetPatternPackageImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/util/JetPatternAdapterFactory.java b/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/util/JetPatternAdapterFactory.java
index 2f24ef8..dd37726 100644
--- a/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/util/JetPatternAdapterFactory.java
+++ b/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/util/JetPatternAdapterFactory.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/util/JetPatternSwitch.java b/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/util/JetPatternSwitch.java
index 2116739..eda48d0 100644
--- a/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/util/JetPatternSwitch.java
+++ b/plugins/org.eclipse.egf.model.jetpattern/generated/org/eclipse/egf/model/jetpattern/util/JetPatternSwitch.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model.jetpattern/plugin.properties b/plugins/org.eclipse.egf.model.jetpattern/plugin.properties
index a1aee2f..d4eb7a6 100644
--- a/plugins/org.eclipse.egf.model.jetpattern/plugin.properties
+++ b/plugins/org.eclipse.egf.model.jetpattern/plugin.properties
@@ -2,10 +2,13 @@
 # <copyright>

 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/build.properties b/plugins/org.eclipse.egf.model/build.properties
index 20beb4c..c9ce133 100644
--- a/plugins/org.eclipse.egf.model/build.properties
+++ b/plugins/org.eclipse.egf.model/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/EGFModelPlugin.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/EGFModelPlugin.java
index 7cd4706..de43a03 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/EGFModelPlugin.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/EGFModelPlugin.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/Domain.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/Domain.java
index d75b557..4641907 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/Domain.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/Domain.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/DomainFactory.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/DomainFactory.java
index 5ffd6e3..e125224 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/DomainFactory.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/DomainFactory.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/DomainPackage.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/DomainPackage.java
index aeefe34..5122b0c 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/DomainPackage.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/DomainPackage.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/DomainViewpoint.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/DomainViewpoint.java
index a2dcb6f..51ac16e 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/DomainViewpoint.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/DomainViewpoint.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/EMFDomain.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/EMFDomain.java
index e17e410..4a09668 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/EMFDomain.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/EMFDomain.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/FilesystemDomain.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/FilesystemDomain.java
index 265c885..3f57522 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/FilesystemDomain.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/FilesystemDomain.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/LoadableDomain.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/LoadableDomain.java
index e6e47db..b22d863 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/LoadableDomain.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/LoadableDomain.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/TypeDomain.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/TypeDomain.java
index 6ade0dd..dfd0c11 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/TypeDomain.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/TypeDomain.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/TypeGenPackages.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/TypeGenPackages.java
index 4249ab9..fba7aba 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/TypeGenPackages.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/TypeGenPackages.java
@@ -1,10 +1,12 @@
 /**

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/WorkspaceDomain.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/WorkspaceDomain.java
index 51f1bec..a665126 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/WorkspaceDomain.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/WorkspaceDomain.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/DomainFactoryImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/DomainFactoryImpl.java
index 2c16699..1f374d5 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/DomainFactoryImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/DomainFactoryImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/DomainImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/DomainImpl.java
index 782763d..018eabe 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/DomainImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/DomainImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/DomainPackageImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/DomainPackageImpl.java
index 7afeca5..d962ef4 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/DomainPackageImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/DomainPackageImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/DomainViewpointImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/DomainViewpointImpl.java
index 8b379fb..73cd219 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/DomainViewpointImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/DomainViewpointImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/EMFDomainImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/EMFDomainImpl.java
index daca536..edd7b51 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/EMFDomainImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/EMFDomainImpl.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/FilesystemDomainImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/FilesystemDomainImpl.java
index 4fa70a2..cf238eb 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/FilesystemDomainImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/FilesystemDomainImpl.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/LoadableDomainImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/LoadableDomainImpl.java
index 715946f..1cc7e3f 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/LoadableDomainImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/LoadableDomainImpl.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/TypeDomainImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/TypeDomainImpl.java
index 6041474..c70a0a9 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/TypeDomainImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/TypeDomainImpl.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/TypeGenPackagesImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/TypeGenPackagesImpl.java
index 1ac70db..5731328 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/TypeGenPackagesImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/TypeGenPackagesImpl.java
@@ -1,10 +1,12 @@
 /**

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/WorkspaceDomainImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/WorkspaceDomainImpl.java
index 29d2de3..9016e26 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/WorkspaceDomainImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/impl/WorkspaceDomainImpl.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/util/DomainAdapterFactory.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/util/DomainAdapterFactory.java
index 1e2f0f7..19f8e0b 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/util/DomainAdapterFactory.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/util/DomainAdapterFactory.java
@@ -1,10 +1,12 @@
 /**

  * 

 O * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/util/DomainSwitch.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/util/DomainSwitch.java
index 9ff7af5..2587586 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/util/DomainSwitch.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/util/DomainSwitch.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/util/DomainValidator.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/util/DomainValidator.java
index 991b40e..b6f3570 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/util/DomainValidator.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/domain/util/DomainValidator.java
@@ -1,10 +1,12 @@
 /**
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/Activity.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/Activity.java
index a58d656..4e12f7e 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/Activity.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/Activity.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/Contract.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/Contract.java
index 70ea14e..6ec7df5 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/Contract.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/Contract.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/ContractContainer.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/ContractContainer.java
index c46dc5f..f58193b 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/ContractContainer.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/ContractContainer.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/ContractMode.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/ContractMode.java
index 8bba775..41dd131 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/ContractMode.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/ContractMode.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/FactoryComponent.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/FactoryComponent.java
index 3bdbbc9..1e26bf9 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/FactoryComponent.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/FactoryComponent.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/FactoryComponentContract.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/FactoryComponentContract.java
index 8325735..ea2094b 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/FactoryComponentContract.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/FactoryComponentContract.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/FcoreFactory.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/FcoreFactory.java
index 0e44aa2..b7ebb02 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/FcoreFactory.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/FcoreFactory.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/FcorePackage.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/FcorePackage.java
index 44b0d19..2830dd0 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/FcorePackage.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/FcorePackage.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/Invocation.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/Invocation.java
index b477022..8bedbaf 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/Invocation.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/Invocation.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/InvocationContract.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/InvocationContract.java
index 79ec2dd..02d90fa 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/InvocationContract.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/InvocationContract.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/InvocationContractContainer.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/InvocationContractContainer.java
index 020cc93..e3f38c4 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/InvocationContractContainer.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/InvocationContractContainer.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/ModelElement.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/ModelElement.java
index 27ec543..2ea9189 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/ModelElement.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/ModelElement.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/NamedModelElement.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/NamedModelElement.java
index 448ae12..61c2084 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/NamedModelElement.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/NamedModelElement.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/Orchestration.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/Orchestration.java
index 28257a7..545f065 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/Orchestration.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/Orchestration.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/OrchestrationParameter.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/OrchestrationParameter.java
index d4f38a2..9b69404 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/OrchestrationParameter.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/OrchestrationParameter.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/OrchestrationParameterContainer.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/OrchestrationParameterContainer.java
index 4883cc4..43e6f14 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/OrchestrationParameterContainer.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/OrchestrationParameterContainer.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/Viewpoint.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/Viewpoint.java
index ad67497..1991821 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/Viewpoint.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/Viewpoint.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/ViewpointContainer.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/ViewpointContainer.java
index 24e6a39..92cb762 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/ViewpointContainer.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/ViewpointContainer.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/ActivityImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/ActivityImpl.java
index b3ad5f5..a577b6d 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/ActivityImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/ActivityImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/ContractContainerImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/ContractContainerImpl.java
index 64ce4c7..e2fe301 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/ContractContainerImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/ContractContainerImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/ContractImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/ContractImpl.java
index 5998419..de4b202 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/ContractImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/ContractImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/FactoryComponentContractImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/FactoryComponentContractImpl.java
index 6fea5eb..c8ba02f 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/FactoryComponentContractImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/FactoryComponentContractImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/FactoryComponentImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/FactoryComponentImpl.java
index 602fa7e..b38983d 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/FactoryComponentImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/FactoryComponentImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/FcoreFactoryImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/FcoreFactoryImpl.java
index 5a0e1ec..f2365c1 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/FcoreFactoryImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/FcoreFactoryImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/FcorePackageImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/FcorePackageImpl.java
index 5510184..8ed753c 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/FcorePackageImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/FcorePackageImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/InvocationContractContainerImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/InvocationContractContainerImpl.java
index b8e8656..cf2a6e5 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/InvocationContractContainerImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/InvocationContractContainerImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/InvocationContractImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/InvocationContractImpl.java
index d2b7164..2f59f09 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/InvocationContractImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/InvocationContractImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/InvocationImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/InvocationImpl.java
index d2aba8d..90cc98b 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/InvocationImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/InvocationImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/ModelElementImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/ModelElementImpl.java
index 97d5ceb..ff091ff 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/ModelElementImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/ModelElementImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/NamedModelElementImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/NamedModelElementImpl.java
index 35e309f..531abdb 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/NamedModelElementImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/NamedModelElementImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/OrchestrationImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/OrchestrationImpl.java
index 1f99fbf..b17ef6f 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/OrchestrationImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/OrchestrationImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/OrchestrationParameterContainerImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/OrchestrationParameterContainerImpl.java
index a7fb524..e0f1c95 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/OrchestrationParameterContainerImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/OrchestrationParameterContainerImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/OrchestrationParameterImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/OrchestrationParameterImpl.java
index 18b1f1b..c320470 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/OrchestrationParameterImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/OrchestrationParameterImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/ViewpointContainerImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/ViewpointContainerImpl.java
index 30fe560..4c3c43f 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/ViewpointContainerImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/ViewpointContainerImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/ViewpointImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/ViewpointImpl.java
index 4a34ff7..e524c9c 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/ViewpointImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/impl/ViewpointImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/util/FcoreAdapterFactory.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/util/FcoreAdapterFactory.java
index ea3b658..d163685 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/util/FcoreAdapterFactory.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/util/FcoreAdapterFactory.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/util/FcoreResourceFactoryImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/util/FcoreResourceFactoryImpl.java
index 6b64362..2558985 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/util/FcoreResourceFactoryImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/util/FcoreResourceFactoryImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/util/FcoreResourceImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/util/FcoreResourceImpl.java
index ae95088..65d0d34 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/util/FcoreResourceImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/util/FcoreResourceImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
  */
diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/util/FcoreSwitch.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/util/FcoreSwitch.java
index ad4c880..7ed1292 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/util/FcoreSwitch.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/util/FcoreSwitch.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/util/FcoreValidator.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/util/FcoreValidator.java
index 6a40af4..fa29439 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/util/FcoreValidator.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/fcore/util/FcoreValidator.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/Mapping.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/Mapping.java
index b0b959e..09016fb 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/Mapping.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/Mapping.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/MappingDomain.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/MappingDomain.java
index 3ab3330..d52ab0b 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/MappingDomain.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/MappingDomain.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/MappingFactory.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/MappingFactory.java
index 5378a65..a1fc5ef 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/MappingFactory.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/MappingFactory.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/MappingPackage.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/MappingPackage.java
index 9a0221a..ff2892f 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/MappingPackage.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/MappingPackage.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/MappingViewpoint.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/MappingViewpoint.java
index 81435a6..3b61089 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/MappingViewpoint.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/MappingViewpoint.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/impl/MappingDomainImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/impl/MappingDomainImpl.java
index 9fa0cff..86a51f7 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/impl/MappingDomainImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/impl/MappingDomainImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/impl/MappingFactoryImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/impl/MappingFactoryImpl.java
index 833bfa8..9ffe036 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/impl/MappingFactoryImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/impl/MappingFactoryImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

 O * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/impl/MappingImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/impl/MappingImpl.java
index 455a1cf..4b5c6d5 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/impl/MappingImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/impl/MappingImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/impl/MappingPackageImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/impl/MappingPackageImpl.java
index bd8b970..55e4b1f 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/impl/MappingPackageImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/impl/MappingPackageImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/impl/MappingViewpointImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/impl/MappingViewpointImpl.java
index f69f42d..063f3dd 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/impl/MappingViewpointImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/impl/MappingViewpointImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/util/MappingAdapterFactory.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/util/MappingAdapterFactory.java
index 71d12a3..598d7fb 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/util/MappingAdapterFactory.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/util/MappingAdapterFactory.java
@@ -1,9 +1,11 @@
 /**

  * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/util/MappingSwitch.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/util/MappingSwitch.java
index 4920e20..a3f7212 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/util/MappingSwitch.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/mapping/util/MappingSwitch.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/AbstractPatternCall.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/AbstractPatternCall.java
index eacf459..dd89e9e 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/AbstractPatternCall.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/AbstractPatternCall.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/BackCall.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/BackCall.java
index c54e96f..a836902 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/BackCall.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/BackCall.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/BasicQuery.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/BasicQuery.java
index 01add4e..0819dce 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/BasicQuery.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/BasicQuery.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/Call.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/Call.java
index d4c9bb6..c31f530 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/Call.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/Call.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/CustomQuery.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/CustomQuery.java
index 2d0da5e..9769b0c 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/CustomQuery.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/CustomQuery.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/InjectedContext.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/InjectedContext.java
index bdd3021..ab15ac1 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/InjectedContext.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/InjectedContext.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/MethodCall.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/MethodCall.java
index f298f34..ff089ab 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/MethodCall.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/MethodCall.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/Pattern.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/Pattern.java
index 971447a..c2662fa 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/Pattern.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/Pattern.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternCall.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternCall.java
index 666613d..7f0b52a 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternCall.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternCall.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternElement.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternElement.java
index 7105ffd..8dedcb2 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternElement.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternElement.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternFactory.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternFactory.java
index 8676b7a..1294444 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternFactory.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternFactory.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternInjectedCall.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternInjectedCall.java
index 19d6847..e472016 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternInjectedCall.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternInjectedCall.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternLibrary.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternLibrary.java
index d267b04..0015107 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternLibrary.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternLibrary.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternMethod.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternMethod.java
index a3e29bf..2d892ef 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternMethod.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternMethod.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternNature.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternNature.java
index 0eb1804..b328493 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternNature.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternNature.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternPackage.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternPackage.java
index 4b3b98d..a8b2e66 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternPackage.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternPackage.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternParameter.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternParameter.java
index 3083063..7e91187 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternParameter.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternParameter.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternVariable.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternVariable.java
index 44d678b..f36e390 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternVariable.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternVariable.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternViewpoint.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternViewpoint.java
index 1d39f8f..c97f24f 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternViewpoint.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/PatternViewpoint.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/Query.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/Query.java
index 2338fed..79d6223 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/Query.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/Query.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/StringQuery.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/StringQuery.java
index 2ef5333..a3b34b1 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/StringQuery.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/StringQuery.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/Substitution.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/Substitution.java
index f9daae3..b06cca4 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/Substitution.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/Substitution.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/SuperCall.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/SuperCall.java
index 567cea0..aaefc31 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/SuperCall.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/SuperCall.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/TypePatternCallBackHandler.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/TypePatternCallBackHandler.java
index dbd3212..7763d0f 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/TypePatternCallBackHandler.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/TypePatternCallBackHandler.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/TypePatternDomainVisitor.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/TypePatternDomainVisitor.java
index decc20f..0026e98 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/TypePatternDomainVisitor.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/TypePatternDomainVisitor.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/TypePatternExecutionReporter.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/TypePatternExecutionReporter.java
index df86d58..ea2e27d 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/TypePatternExecutionReporter.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/TypePatternExecutionReporter.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/TypePatternList.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/TypePatternList.java
index badf546..2f5ff23 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/TypePatternList.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/TypePatternList.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/TypePatternOutputProcessor.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/TypePatternOutputProcessor.java
index 218bd7e..1d19aed 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/TypePatternOutputProcessor.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/TypePatternOutputProcessor.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/TypePatternSubstitution.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/TypePatternSubstitution.java
index 5084614..6b006b9 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/TypePatternSubstitution.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/TypePatternSubstitution.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/AbstractPatternCallImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/AbstractPatternCallImpl.java
index 1d505b1..dad9fcd 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/AbstractPatternCallImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/AbstractPatternCallImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/BackCallImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/BackCallImpl.java
index 293474c..c08d57d 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/BackCallImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/BackCallImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/BasicQueryImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/BasicQueryImpl.java
index fd195e4..9e571dc 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/BasicQueryImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/BasicQueryImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/CallImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/CallImpl.java
index 7d6569c..9fe63ec 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/CallImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/CallImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/CustomQueryImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/CustomQueryImpl.java
index 33c427f..de8958f 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/CustomQueryImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/CustomQueryImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/MethodCallImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/MethodCallImpl.java
index c044215..e34650e 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/MethodCallImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/MethodCallImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/Paramerter2ParameterMapImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/Paramerter2ParameterMapImpl.java
index 6e460c6..ea471b7 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/Paramerter2ParameterMapImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/Paramerter2ParameterMapImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternCallImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternCallImpl.java
index 92cec84..995c481 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternCallImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternCallImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternElementImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternElementImpl.java
index 11eb17a..eb74ea1 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternElementImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternElementImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternFactoryImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternFactoryImpl.java
index 40a50e8..78ee18f 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternFactoryImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternFactoryImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternImpl.java
index 2764fe3..e8c7a77 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternInjectedCallImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternInjectedCallImpl.java
index 23d3df1..22dc359 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternInjectedCallImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternInjectedCallImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternLibraryImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternLibraryImpl.java
index f33cb35..ab383b1 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternLibraryImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternLibraryImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternMethodImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternMethodImpl.java
index fb0990f..57a3daa 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternMethodImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternMethodImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternNatureImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternNatureImpl.java
index dbcf519..d9a611f 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternNatureImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternNatureImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternPackageImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternPackageImpl.java
index de78818..803e9a9 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternPackageImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternPackageImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternParameterImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternParameterImpl.java
index 77150ae..68ae9a4 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternParameterImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternParameterImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternVariableImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternVariableImpl.java
index 40e1e32..cc0f2dd 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternVariableImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternVariableImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternViewpointImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternViewpointImpl.java
index 84d0086..8a6aa0c 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternViewpointImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/PatternViewpointImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/QueryImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/QueryImpl.java
index 9af1619..cb8f8aa 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/QueryImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/QueryImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/String2PatternListImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/String2PatternListImpl.java
index 469656d..78dffb8 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/String2PatternListImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/String2PatternListImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/String2StringImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/String2StringImpl.java
index 986f2ea..0f6ac9c 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/String2StringImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/String2StringImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/StringQueryImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/StringQueryImpl.java
index 209be18..31bba90 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/StringQueryImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/StringQueryImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/SubstitutionImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/SubstitutionImpl.java
index f8fa658..e686fce 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/SubstitutionImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/SubstitutionImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/SuperCallImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/SuperCallImpl.java
index df989b2..ccf4703 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/SuperCallImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/SuperCallImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/TypePatternCallBackHandlerImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/TypePatternCallBackHandlerImpl.java
index 3759e9a..7bda589 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/TypePatternCallBackHandlerImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/TypePatternCallBackHandlerImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/TypePatternDomainVisitorImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/TypePatternDomainVisitorImpl.java
index aed007a..82155dd 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/TypePatternDomainVisitorImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/TypePatternDomainVisitorImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/TypePatternExecutionReporterImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/TypePatternExecutionReporterImpl.java
index f0c6895..53674a8 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/TypePatternExecutionReporterImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/TypePatternExecutionReporterImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/TypePatternListImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/TypePatternListImpl.java
index d07e09e..cd52f96 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/TypePatternListImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/TypePatternListImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/TypePatternOutputProcessorImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/TypePatternOutputProcessorImpl.java
index b9f07e1..6f09213 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/TypePatternOutputProcessorImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/TypePatternOutputProcessorImpl.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/TypePatternSubstitutionImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/TypePatternSubstitutionImpl.java
index e532bd3..dc068bc 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/TypePatternSubstitutionImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/impl/TypePatternSubstitutionImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/util/PatternAdapterFactory.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/util/PatternAdapterFactory.java
index 92513bb..a497087 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/util/PatternAdapterFactory.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/util/PatternAdapterFactory.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/util/PatternSwitch.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/util/PatternSwitch.java
index b7dad26..b8da3b6 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/util/PatternSwitch.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/util/PatternSwitch.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/util/PatternValidator.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/util/PatternValidator.java
index 4972eed..0912844 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/util/PatternValidator.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/pattern/util/PatternValidator.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/Type.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/Type.java
index 14172a5..d4711d8 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/Type.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/Type.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeAbstractClass.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeAbstractClass.java
index deceeb0..1c639f4 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeAbstractClass.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeAbstractClass.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeBigDecimal.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeBigDecimal.java
index 223a383..7fe99df 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeBigDecimal.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeBigDecimal.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeBigInteger.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeBigInteger.java
index f1eec1a..06926bf 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeBigInteger.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeBigInteger.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeBoolean.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeBoolean.java
index 17c00aa..d5ad841 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeBoolean.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeBoolean.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeByte.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeByte.java
index ba03d37..cdb065a 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeByte.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeByte.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeCharacter.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeCharacter.java
index c4a5878..d33c9fb 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeCharacter.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeCharacter.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeClass.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeClass.java
index 638c29c..4e29ce1 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeClass.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeClass.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeCollection.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeCollection.java
index a2aef51..8f6ad56 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeCollection.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeCollection.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeDate.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeDate.java
index df68b06..4ce1701 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeDate.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeDate.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeDouble.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeDouble.java
index 57b267d..6febe39 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeDouble.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeDouble.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeElement.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeElement.java
index 2c1033a..a2fbcbc 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeElement.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeElement.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeFloat.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeFloat.java
index 823ef43..de5e205 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeFloat.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeFloat.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeInteger.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeInteger.java
index 3f67563..f87d48d 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeInteger.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeInteger.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeList.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeList.java
index df0b17f..9c9760d 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeList.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeList.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeLong.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeLong.java
index f0473fe..0b60d05 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeLong.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeLong.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeMap.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeMap.java
index 5f00fc7..ef3ab82 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeMap.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeMap.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeObject.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeObject.java
index 9ca4ec3..ec7e3b2 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeObject.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeObject.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeSet.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeSet.java
index 5e408a3..f69e1e5 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeSet.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeSet.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeShort.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeShort.java
index 4dee7a5..567e2d4 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeShort.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeShort.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeString.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeString.java
index dd233a1..82393a6 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeString.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeString.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeURI.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeURI.java
index 09620d8..49d9620 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeURI.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypeURI.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypesFactory.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypesFactory.java
index 6fb78a2..20a8703 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypesFactory.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypesFactory.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypesPackage.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypesPackage.java
index 9e0e183..a03546b 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypesPackage.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/TypesPackage.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeAbstractClassImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeAbstractClassImpl.java
index cadde5e..41e4b5e 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeAbstractClassImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeAbstractClassImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeBigDecimalImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeBigDecimalImpl.java
index cf08a20..47857e1 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeBigDecimalImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeBigDecimalImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeBigIntegerImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeBigIntegerImpl.java
index c2cd302..08fb8c7 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeBigIntegerImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeBigIntegerImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeBooleanImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeBooleanImpl.java
index a2a595d..1452ebb 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeBooleanImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeBooleanImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeByteImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeByteImpl.java
index c88cbb8..72bbf4e 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeByteImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeByteImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeCharacterImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeCharacterImpl.java
index afda061..a46d771 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeCharacterImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeCharacterImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeClassImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeClassImpl.java
index d2c97d6..67c1182 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeClassImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeClassImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeCollectionImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeCollectionImpl.java
index 93f0f55..bfdd542 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeCollectionImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeCollectionImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeDateImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeDateImpl.java
index e708c50..abf1adc 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeDateImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeDateImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeDoubleImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeDoubleImpl.java
index af41cee..4a5ca62 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeDoubleImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeDoubleImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeElementImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeElementImpl.java
index 9506393..ab590fd 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeElementImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeElementImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeFloatImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeFloatImpl.java
index 7a4ab48..4ace1a9 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeFloatImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeFloatImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeImpl.java
index e308914..57b321d 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeIntegerImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeIntegerImpl.java
index a22dc20..f62b96b 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeIntegerImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeIntegerImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeListImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeListImpl.java
index 3ad3325..44ff435 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeListImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeListImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeLongImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeLongImpl.java
index dc7c28e..5cbfc3b 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeLongImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeLongImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeMapImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeMapImpl.java
index 40b7af0..31a973d 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeMapImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeMapImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeObjectImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeObjectImpl.java
index 68ded2a..1ae00fd 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeObjectImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeObjectImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeSetImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeSetImpl.java
index d7f2a01..6dc741e 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeSetImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeSetImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeShortImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeShortImpl.java
index ca70c26..18a94a0 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeShortImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeShortImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeStringImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeStringImpl.java
index d60803d..c7562d2 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeStringImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeStringImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeURIImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeURIImpl.java
index 60b7663..1920a73 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeURIImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypeURIImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypesFactoryImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypesFactoryImpl.java
index 694e618..2bf6673 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypesFactoryImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypesFactoryImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypesPackageImpl.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypesPackageImpl.java
index 8fa1fdb..78addb4 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypesPackageImpl.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/impl/TypesPackageImpl.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/util/TypesAdapterFactory.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/util/TypesAdapterFactory.java
index 83abd56..faf546e 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/util/TypesAdapterFactory.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/util/TypesAdapterFactory.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/util/TypesSwitch.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/util/TypesSwitch.java
index c9cffb5..99aafeb 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/util/TypesSwitch.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/util/TypesSwitch.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/util/TypesValidator.java b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/util/TypesValidator.java
index 05f2050..50e4225 100644
--- a/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/util/TypesValidator.java
+++ b/plugins/org.eclipse.egf.model/generated/org/eclipse/egf/model/types/util/TypesValidator.java
@@ -1,10 +1,12 @@
 /**

  * 

 O * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/plugin.properties b/plugins/org.eclipse.egf.model/plugin.properties
index 82cb9c4..ddcd271 100644
--- a/plugins/org.eclipse.egf.model/plugin.properties
+++ b/plugins/org.eclipse.egf.model/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/plugin.xml b/plugins/org.eclipse.egf.model/plugin.xml
index 1f46c9d..9083f87 100644
--- a/plugins/org.eclipse.egf.model/plugin.xml
+++ b/plugins/org.eclipse.egf.model/plugin.xml
@@ -3,10 +3,12 @@
 

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/domain/helper/TypeGenPackageHelper.java b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/domain/helper/TypeGenPackageHelper.java
index fcd3cf2..ccae51e 100644
--- a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/domain/helper/TypeGenPackageHelper.java
+++ b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/domain/helper/TypeGenPackageHelper.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/fcore/adapter/InvocationContractAdapter.java b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/fcore/adapter/InvocationContractAdapter.java
index 9ba3bc2..1fad517 100644
--- a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/fcore/adapter/InvocationContractAdapter.java
+++ b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/fcore/adapter/InvocationContractAdapter.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/fcore/util/FcoreXMIHelperImpl.java b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/fcore/util/FcoreXMIHelperImpl.java
index ac194ba..d8d969c 100644
--- a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/fcore/util/FcoreXMIHelperImpl.java
+++ b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/fcore/util/FcoreXMIHelperImpl.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  */

diff --git a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/fcore/util/FcoreXMISaveImpl.java b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/fcore/util/FcoreXMISaveImpl.java
index d6b7548..873afa6 100644
--- a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/fcore/util/FcoreXMISaveImpl.java
+++ b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/fcore/util/FcoreXMISaveImpl.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/helper/ActivityCycleFinder.java b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/helper/ActivityCycleFinder.java
index 356703a..58c8b12 100644
--- a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/helper/ActivityCycleFinder.java
+++ b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/helper/ActivityCycleFinder.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/helper/ValidationHelper.java b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/helper/ValidationHelper.java
index cbe8227..366b7c9 100644
--- a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/helper/ValidationHelper.java
+++ b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/helper/ValidationHelper.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/l10n/EGFModelMessages.java b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/l10n/EGFModelMessages.java
index 33a2a46..906e6a4 100644
--- a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/l10n/EGFModelMessages.java
+++ b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/l10n/EGFModelMessages.java
@@ -1,9 +1,12 @@
 /**

  * Copyright (c) 2000, 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

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * IBM Corporation - initial API and implementation

  * Thales Corporate Services S.A.S

diff --git a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/l10n/messages.properties b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/l10n/messages.properties
index 6275623..388bbeb 100644
--- a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/l10n/messages.properties
+++ b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/l10n/messages.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/BundleAccessor.java b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/BundleAccessor.java
index 482273d..c212937 100644
--- a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/BundleAccessor.java
+++ b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/BundleAccessor.java
@@ -1,9 +1,11 @@
 /**
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/CallBackHandler.java b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/CallBackHandler.java
index 640a0c9..bdd2f01 100644
--- a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/CallBackHandler.java
+++ b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/CallBackHandler.java
@@ -1,9 +1,11 @@
 /**
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/DefaultPatternOutputProcessor.java b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/DefaultPatternOutputProcessor.java
index f4fcd93..c0bad08 100644
--- a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/DefaultPatternOutputProcessor.java
+++ b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/DefaultPatternOutputProcessor.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2011 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/DomainVisitor.java b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/DomainVisitor.java
index 3f68efe..06443c0 100644
--- a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/DomainVisitor.java
+++ b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/DomainVisitor.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/Node.java b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/Node.java
index 685e88a..3297b18 100644
--- a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/Node.java
+++ b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/Node.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/PatternContext.java b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/PatternContext.java
index bd143b3..1cf64f5 100644
--- a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/PatternContext.java
+++ b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/PatternContext.java
@@ -1,10 +1,12 @@
 /**
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/PatternException.java b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/PatternException.java
index 7a191b2..2e795ba 100644
--- a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/PatternException.java
+++ b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/PatternException.java
@@ -1,10 +1,12 @@
 /**
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/PatternExecutionReporter.java b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/PatternExecutionReporter.java
index a5dd28a..d8300de 100644
--- a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/PatternExecutionReporter.java
+++ b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/PatternExecutionReporter.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/PatternNameHelper.java b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/PatternNameHelper.java
index 06c6b86..071035e 100644
--- a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/PatternNameHelper.java
+++ b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/PatternNameHelper.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/PatternOutputProcessor.java b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/PatternOutputProcessor.java
index 54620a6..495d78a 100644
--- a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/PatternOutputProcessor.java
+++ b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/PatternOutputProcessor.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/PatternRuntimeException.java b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/PatternRuntimeException.java
index b7c26f5..122da93 100644
--- a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/PatternRuntimeException.java
+++ b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/PatternRuntimeException.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/adapter/SubstitutionAdapter.java b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/adapter/SubstitutionAdapter.java
index fa8e3f7..ab43b65 100644
--- a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/adapter/SubstitutionAdapter.java
+++ b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/adapter/SubstitutionAdapter.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/template/TemplateModelFileHelper.java b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/template/TemplateModelFileHelper.java
index 0e3ca0d..3ff5b11 100644
--- a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/template/TemplateModelFileHelper.java
+++ b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/pattern/template/TemplateModelFileHelper.java
@@ -1,10 +1,12 @@
 /**
  * <copyright>
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
  * </copyright>
diff --git a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/types/TypesException.java b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/types/TypesException.java
index d1e638a..9de9896 100644
--- a/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/types/TypesException.java
+++ b/plugins/org.eclipse.egf.model/src/org/eclipse/egf/model/types/TypesException.java
@@ -1,10 +1,12 @@
 /**
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ftask/build.properties b/plugins/org.eclipse.egf.pattern.ftask/build.properties
index c685e92..d1e7994 100644
--- a/plugins/org.eclipse.egf.pattern.ftask/build.properties
+++ b/plugins/org.eclipse.egf.pattern.ftask/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ftask/plugin.properties b/plugins/org.eclipse.egf.pattern.ftask/plugin.properties
index c1217cd..28d9e3a 100644
--- a/plugins/org.eclipse.egf.pattern.ftask/plugin.properties
+++ b/plugins/org.eclipse.egf.pattern.ftask/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/Messages.java b/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/Messages.java
index 86813bc..fb3ba3c 100644
--- a/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/Messages.java
+++ b/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/Messages.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/AbstractPatternTask.java b/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/AbstractPatternTask.java
index ffbd98d..e03f618 100644
--- a/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/AbstractPatternTask.java
+++ b/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/AbstractPatternTask.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/AbstractStrategyTask.java b/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/AbstractStrategyTask.java
index ff7308b..65e5ae8 100644
--- a/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/AbstractStrategyTask.java
+++ b/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/AbstractStrategyTask.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/DefaultStrategyTask.java b/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/DefaultStrategyTask.java
index d2c0128..f682350 100644
--- a/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/DefaultStrategyTask.java
+++ b/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/DefaultStrategyTask.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/DomainDrivenStrategyTask.java b/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/DomainDrivenStrategyTask.java
index 8641181..9acf8ca 100644
--- a/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/DomainDrivenStrategyTask.java
+++ b/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/DomainDrivenStrategyTask.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/DomainDrivenValidationStrategyTask.java b/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/DomainDrivenValidationStrategyTask.java
index 7b1d38e..454a76a 100644
--- a/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/DomainDrivenValidationStrategyTask.java
+++ b/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/DomainDrivenValidationStrategyTask.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/FilterStrategyTask.java b/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/FilterStrategyTask.java
index 3b15844..b306404 100644
--- a/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/FilterStrategyTask.java
+++ b/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/FilterStrategyTask.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/PatternSubstitutionCompositionTask.java b/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/PatternSubstitutionCompositionTask.java
index 3feb9bb..2374cca 100644
--- a/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/PatternSubstitutionCompositionTask.java
+++ b/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/PatternSubstitutionCompositionTask.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/PatternTask.java b/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/PatternTask.java
index 38bcbb1..5b78e93 100644
--- a/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/PatternTask.java
+++ b/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/PatternTask.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/StrategyReporter.java b/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/StrategyReporter.java
index 4c696f1..bfd4a7b 100644
--- a/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/StrategyReporter.java
+++ b/plugins/org.eclipse.egf.pattern.ftask/src/org/eclipse/egf/pattern/ftask/tasks/StrategyReporter.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.java/build.properties b/plugins/org.eclipse.egf.pattern.java/build.properties
index 7453a74..8513603 100644
--- a/plugins/org.eclipse.egf.pattern.java/build.properties
+++ b/plugins/org.eclipse.egf.pattern.java/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.java/plugin.properties b/plugins/org.eclipse.egf.pattern.java/plugin.properties
index 4fa50f7..b71eb40 100644
--- a/plugins/org.eclipse.egf.pattern.java/plugin.properties
+++ b/plugins/org.eclipse.egf.pattern.java/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/JavaPatternMessages.properties b/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/JavaPatternMessages.properties
index dc81b84..9c66756 100644
--- a/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/JavaPatternMessages.properties
+++ b/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/JavaPatternMessages.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/JavaPreferences.java b/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/JavaPreferences.java
index 34dc56f..7e9bb70 100644
--- a/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/JavaPreferences.java
+++ b/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/JavaPreferences.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/Messages.java b/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/Messages.java
index 3976031..4e4fb0e 100644
--- a/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/Messages.java
+++ b/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/Messages.java
@@ -1,10 +1,12 @@
 /**
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/engine/JavaAssemblyContentProvider.java b/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/engine/JavaAssemblyContentProvider.java
index 57baca4..f8e02d7 100644
--- a/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/engine/JavaAssemblyContentProvider.java
+++ b/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/engine/JavaAssemblyContentProvider.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/engine/JavaAssemblyHelper.java b/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/engine/JavaAssemblyHelper.java
index 7341a04..26e6498 100644
--- a/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/engine/JavaAssemblyHelper.java
+++ b/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/engine/JavaAssemblyHelper.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/engine/JavaEngine.java b/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/engine/JavaEngine.java
index fbec208..c57c2b0 100644
--- a/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/engine/JavaEngine.java
+++ b/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/engine/JavaEngine.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/engine/JavaNatureHelper.java b/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/engine/JavaNatureHelper.java
index 7fc064f..c71c82a 100644
--- a/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/engine/JavaNatureHelper.java
+++ b/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/engine/JavaNatureHelper.java
@@ -1,10 +1,12 @@
 /**
  * <copyright>
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
  * </copyright>
diff --git a/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/engine/JavaTranslationEnhancer.java b/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/engine/JavaTranslationEnhancer.java
index 15b34f8..303970b 100644
--- a/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/engine/JavaTranslationEnhancer.java
+++ b/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/engine/JavaTranslationEnhancer.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/extension/JavaPatternExtension.java b/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/extension/JavaPatternExtension.java
index e7a45c4..80c2ef3 100644
--- a/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/extension/JavaPatternExtension.java
+++ b/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/extension/JavaPatternExtension.java
@@ -1,10 +1,12 @@
 /**
  * <copyright>
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
  * </copyright>
diff --git a/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/extension/JavaPatternFactory.java b/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/extension/JavaPatternFactory.java
index 471ed31..c1ad998 100644
--- a/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/extension/JavaPatternFactory.java
+++ b/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/extension/JavaPatternFactory.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/extension/JavaPatternInitializer.java b/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/extension/JavaPatternInitializer.java
index bf7fe39..e13a836 100644
--- a/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/extension/JavaPatternInitializer.java
+++ b/plugins/org.eclipse.egf.pattern.java/src/org/eclipse/egf/pattern/java/extension/JavaPatternInitializer.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.jet/build.properties b/plugins/org.eclipse.egf.pattern.jet/build.properties
index 78c079d..70537ab 100644
--- a/plugins/org.eclipse.egf.pattern.jet/build.properties
+++ b/plugins/org.eclipse.egf.pattern.jet/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.jet/plugin.properties b/plugins/org.eclipse.egf.pattern.jet/plugin.properties
index 906b0b0..888b958 100644
--- a/plugins/org.eclipse.egf.pattern.jet/plugin.properties
+++ b/plugins/org.eclipse.egf.pattern.jet/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/Activator.java b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/Activator.java
index 677d31b..8a96b7a 100644
--- a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/Activator.java
+++ b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/Activator.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/JetPatternMessages.properties b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/JetPatternMessages.properties
index 61bdcca..2a96f47 100644
--- a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/JetPatternMessages.properties
+++ b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/JetPatternMessages.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/JetPreferences.java b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/JetPreferences.java
index a310a04..5128d9d 100644
--- a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/JetPreferences.java
+++ b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/JetPreferences.java
@@ -1,10 +1,12 @@
 /**
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/JetTagsConstants.java b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/JetTagsConstants.java
index c66b54c..2cbecc1 100644
--- a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/JetTagsConstants.java
+++ b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/JetTagsConstants.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/Messages.java b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/Messages.java
index 36aa481..0e1d944 100644
--- a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/Messages.java
+++ b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/Messages.java
@@ -1,10 +1,12 @@
 /**
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/engine/JetAssemblyContentProvider.java b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/engine/JetAssemblyContentProvider.java
index 8ae3592..a71c0cb 100644
--- a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/engine/JetAssemblyContentProvider.java
+++ b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/engine/JetAssemblyContentProvider.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/engine/JetAssemblyHelper.java b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/engine/JetAssemblyHelper.java
index 9f70d37..533ab32 100644
--- a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/engine/JetAssemblyHelper.java
+++ b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/engine/JetAssemblyHelper.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/engine/JetEngine.java b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/engine/JetEngine.java
index 1f125c5..ea52edb 100644
--- a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/engine/JetEngine.java
+++ b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/engine/JetEngine.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/engine/JetNatureHelper.java b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/engine/JetNatureHelper.java
index 8850dcb..6fd6a67 100644
--- a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/engine/JetNatureHelper.java
+++ b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/engine/JetNatureHelper.java
@@ -1,10 +1,12 @@
 /**
  * <copyright>
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
  * </copyright>
diff --git a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/engine/JetTagsCompiler.java b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/engine/JetTagsCompiler.java
index 47dd087..d3aece1 100644
--- a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/engine/JetTagsCompiler.java
+++ b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/engine/JetTagsCompiler.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/engine/SkeletonJETCompiler.java b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/engine/SkeletonJETCompiler.java
index cfcf2ff..003d321 100644
--- a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/engine/SkeletonJETCompiler.java
+++ b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/engine/SkeletonJETCompiler.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/extension/JetPatternExtension.java b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/extension/JetPatternExtension.java
index cb2f24c..024451f 100644
--- a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/extension/JetPatternExtension.java
+++ b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/extension/JetPatternExtension.java
@@ -1,10 +1,12 @@
 /**
  * <copyright>
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
  * </copyright>
diff --git a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/extension/JetPatternFactory.java b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/extension/JetPatternFactory.java
index fa2916e..e6c4d0e 100644
--- a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/extension/JetPatternFactory.java
+++ b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/extension/JetPatternFactory.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/extension/JetPatternInitializer.java b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/extension/JetPatternInitializer.java
index d4574ae..982cce6 100644
--- a/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/extension/JetPatternInitializer.java
+++ b/plugins/org.eclipse.egf.pattern.jet/src/org/eclipse/egf/pattern/jet/extension/JetPatternInitializer.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ui.java/build.properties b/plugins/org.eclipse.egf.pattern.ui.java/build.properties
index 185b3fc..4726cc4 100644
--- a/plugins/org.eclipse.egf.pattern.ui.java/build.properties
+++ b/plugins/org.eclipse.egf.pattern.ui.java/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui.java/plugin.properties b/plugins/org.eclipse.egf.pattern.ui.java/plugin.properties
index f41d4e1..9214ec1 100644
--- a/plugins/org.eclipse.egf.pattern.ui.java/plugin.properties
+++ b/plugins/org.eclipse.egf.pattern.ui.java/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui.java/src/org/eclipse/egf/pattern/ui/java/Activator.java b/plugins/org.eclipse.egf.pattern.ui.java/src/org/eclipse/egf/pattern/ui/java/Activator.java
index 67a8ae3..076fc68 100644
--- a/plugins/org.eclipse.egf.pattern.ui.java/src/org/eclipse/egf/pattern/ui/java/Activator.java
+++ b/plugins/org.eclipse.egf.pattern.ui.java/src/org/eclipse/egf/pattern/ui/java/Activator.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui.java/src/org/eclipse/egf/pattern/ui/java/ImageShop.java b/plugins/org.eclipse.egf.pattern.ui.java/src/org/eclipse/egf/pattern/ui/java/ImageShop.java
index a91f9f1..eefc1d8 100644
--- a/plugins/org.eclipse.egf.pattern.ui.java/src/org/eclipse/egf/pattern/ui/java/ImageShop.java
+++ b/plugins/org.eclipse.egf.pattern.ui.java/src/org/eclipse/egf/pattern/ui/java/ImageShop.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui.java/src/org/eclipse/egf/pattern/ui/java/JavaTextEditorMessages.java b/plugins/org.eclipse.egf.pattern.ui.java/src/org/eclipse/egf/pattern/ui/java/JavaTextEditorMessages.java
index b4a4778..5ac1182 100644
--- a/plugins/org.eclipse.egf.pattern.ui.java/src/org/eclipse/egf/pattern/ui/java/JavaTextEditorMessages.java
+++ b/plugins/org.eclipse.egf.pattern.ui.java/src/org/eclipse/egf/pattern/ui/java/JavaTextEditorMessages.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui.jet/build.properties b/plugins/org.eclipse.egf.pattern.ui.jet/build.properties
index 185b3fc..4726cc4 100644
--- a/plugins/org.eclipse.egf.pattern.ui.jet/build.properties
+++ b/plugins/org.eclipse.egf.pattern.ui.jet/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui.jet/plugin.properties b/plugins/org.eclipse.egf.pattern.ui.jet/plugin.properties
index 0c61374..62190c9 100644
--- a/plugins/org.eclipse.egf.pattern.ui.jet/plugin.properties
+++ b/plugins/org.eclipse.egf.pattern.ui.jet/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui.jet/src/org/eclipse/egf/pattern/ui/jet/Activator.java b/plugins/org.eclipse.egf.pattern.ui.jet/src/org/eclipse/egf/pattern/ui/jet/Activator.java
index b0833b8..010030f 100644
--- a/plugins/org.eclipse.egf.pattern.ui.jet/src/org/eclipse/egf/pattern/ui/jet/Activator.java
+++ b/plugins/org.eclipse.egf.pattern.ui.jet/src/org/eclipse/egf/pattern/ui/jet/Activator.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui.jet/src/org/eclipse/egf/pattern/ui/jet/ImageShop.java b/plugins/org.eclipse.egf.pattern.ui.jet/src/org/eclipse/egf/pattern/ui/jet/ImageShop.java
index 6e17a92..a4cd3fc 100644
--- a/plugins/org.eclipse.egf.pattern.ui.jet/src/org/eclipse/egf/pattern/ui/jet/ImageShop.java
+++ b/plugins/org.eclipse.egf.pattern.ui.jet/src/org/eclipse/egf/pattern/ui/jet/ImageShop.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/build.properties b/plugins/org.eclipse.egf.pattern.ui/build.properties
index 91f371d..dda6b67 100644
--- a/plugins/org.eclipse.egf.pattern.ui/build.properties
+++ b/plugins/org.eclipse.egf.pattern.ui/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/plugin.properties b/plugins/org.eclipse.egf.pattern.ui/plugin.properties
index b250a94..43fd290 100644
--- a/plugins/org.eclipse.egf.pattern.ui/plugin.properties
+++ b/plugins/org.eclipse.egf.pattern.ui/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/Activator.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/Activator.java
index aa1032b..789b94c 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/Activator.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/Activator.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/ImageShop.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/ImageShop.java
index 05c95d3..ff9db3a 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/ImageShop.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/ImageShop.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/Messages.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/Messages.java
index 3c99fa2..7806426 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/Messages.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/Messages.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/PatternUIHelper.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/PatternUIHelper.java
index c578a55..762191c 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/PatternUIHelper.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/PatternUIHelper.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/PatternUIMessages.properties b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/PatternUIMessages.properties
index 9ba1c8d..023ccdc 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/PatternUIMessages.properties
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/PatternUIMessages.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/builder/PatternBuilder.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/builder/PatternBuilder.java
index 8516a0d..b5124b6 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/builder/PatternBuilder.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/builder/PatternBuilder.java
@@ -1,10 +1,12 @@
 /**
  * <copyright>
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
  * </copyright>
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/compare/CompareHelper.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/compare/CompareHelper.java
index 64870b1..1f19668 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/compare/CompareHelper.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/compare/CompareHelper.java
@@ -1,10 +1,13 @@
 /**

  * <copyright>

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  * </copyright>

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/compare/MethodCompareInput.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/compare/MethodCompareInput.java
index 4361c97..9f4bd46 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/compare/MethodCompareInput.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/compare/MethodCompareInput.java
@@ -1,10 +1,13 @@
 /**

  * <copyright>

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  * </copyright>

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/compare/MethodCompareItem.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/compare/MethodCompareItem.java
index 5ec520c..1500a2b 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/compare/MethodCompareItem.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/compare/MethodCompareItem.java
@@ -1,10 +1,13 @@
 /**

  * <copyright>

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  * </copyright>

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/compare/MethodCompareLabelProvider.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/compare/MethodCompareLabelProvider.java
index afd4fb6..37f2394 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/compare/MethodCompareLabelProvider.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/compare/MethodCompareLabelProvider.java
@@ -1,10 +1,13 @@
 /**

  * <copyright>

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  * </copyright>

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/compare/PatternCompareInput.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/compare/PatternCompareInput.java
index 77e1bb7..d65ae92 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/compare/PatternCompareInput.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/compare/PatternCompareInput.java
@@ -1,10 +1,13 @@
 /**

  * <copyright>

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  * </copyright>

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/AbstractPatternListPropertyEditorContributor.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/AbstractPatternListPropertyEditorContributor.java
index 403b733..b95ee61 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/AbstractPatternListPropertyEditorContributor.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/AbstractPatternListPropertyEditorContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/EditHelper.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/EditHelper.java
index 49eccba..13bb895 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/EditHelper.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/EditHelper.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/PatternListPropertyEditorContributor.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/PatternListPropertyEditorContributor.java
index 5477e5d..12de4f8 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/PatternListPropertyEditorContributor.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/PatternListPropertyEditorContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/PatternListenerContributor.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/PatternListenerContributor.java
index 5ce915e..bbac941 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/PatternListenerContributor.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/PatternListenerContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/PatternMenuContributor.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/PatternMenuContributor.java
index c339d39..310dad7 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/PatternMenuContributor.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/PatternMenuContributor.java
@@ -1,10 +1,12 @@
 /**
  * <copyright>
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
  * </copyright>
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/PatternSubstitutionIncommingPropertyEditorContributor.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/PatternSubstitutionIncommingPropertyEditorContributor.java
index eea6fe4..3c83a3e 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/PatternSubstitutionIncommingPropertyEditorContributor.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/PatternSubstitutionIncommingPropertyEditorContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/PatternSubstitutionOutgoingPropertyEditorContributor.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/PatternSubstitutionOutgoingPropertyEditorContributor.java
index 973fc8b..45ec04f 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/PatternSubstitutionOutgoingPropertyEditorContributor.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/contributions/PatternSubstitutionOutgoingPropertyEditorContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/AbstractPatternMethodEditorInput.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/AbstractPatternMethodEditorInput.java
index eee3eb8..0017256 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/AbstractPatternMethodEditorInput.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/AbstractPatternMethodEditorInput.java
@@ -1,10 +1,12 @@
 /**
  * <copyright>
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
  * </copyright>
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternEditor.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternEditor.java
index 6e31029..660fb1b 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternEditor.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternEditor.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
  */
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternEditorContributor.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternEditorContributor.java
index 68c1855..81bc664 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternEditorContributor.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternEditorContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternEditorInput.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternEditorInput.java
index 5fa2a7d..e3c18f7 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternEditorInput.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternEditorInput.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternElementFactory.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternElementFactory.java
index 4df7954..4c1fe33 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternElementFactory.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternElementFactory.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternMethodEditorInput.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternMethodEditorInput.java
index 64bc72b..9b58a3b 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternMethodEditorInput.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternMethodEditorInput.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternTemplateEditor.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternTemplateEditor.java
index 39988f5..44ced90 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternTemplateEditor.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternTemplateEditor.java
@@ -1,10 +1,12 @@
 /**
  * <copyright>
  * Copyright (c) 2009 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
  * </copyright>
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternTemplateEditorContributor.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternTemplateEditorContributor.java
index 9135146..35616f0 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternTemplateEditorContributor.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/PatternTemplateEditorContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/RuntimePatternMethodEditorInput.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/RuntimePatternMethodEditorInput.java
index 8fac0e4..53ff0fd 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/RuntimePatternMethodEditorInput.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/RuntimePatternMethodEditorInput.java
@@ -1,10 +1,12 @@
 /**
  * <copyright>
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
  * </copyright>
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/WorkspacePatternMethodEditorInput.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/WorkspacePatternMethodEditorInput.java
index 4378c6a..813d3ca 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/WorkspacePatternMethodEditorInput.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/WorkspacePatternMethodEditorInput.java
@@ -1,10 +1,12 @@
 /**
  * <copyright>
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
  * </copyright>
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/actions/OpenPatternDebugAction.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/actions/OpenPatternDebugAction.java
index c53d117..9528382 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/actions/OpenPatternDebugAction.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/actions/OpenPatternDebugAction.java
@@ -1,10 +1,12 @@
 /**
  * <copyright>
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
  * </copyright>
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/actions/OpenReadOnlyPatternDebugAction.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/actions/OpenReadOnlyPatternDebugAction.java
index 1628b49..6092dc0 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/actions/OpenReadOnlyPatternDebugAction.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/actions/OpenReadOnlyPatternDebugAction.java
@@ -1,10 +1,13 @@
 /**

  * <copyright>

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  * XiaoRu Chen, Soyatec

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/adapter/LiveValidationContentAdapter.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/adapter/LiveValidationContentAdapter.java
index 1c5db9a..9a02627 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/adapter/LiveValidationContentAdapter.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/adapter/LiveValidationContentAdapter.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/ContainerLibrarySelectionDialog.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/ContainerLibrarySelectionDialog.java
index c70a4d3..5b131b1 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/ContainerLibrarySelectionDialog.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/ContainerLibrarySelectionDialog.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/ListBuilderDialog.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/ListBuilderDialog.java
index f64c685..ff50031 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/ListBuilderDialog.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/ListBuilderDialog.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/MethodAddOrEditDialog.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/MethodAddOrEditDialog.java
index ff2c751..fd78314 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/MethodAddOrEditDialog.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/MethodAddOrEditDialog.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/ParametersEditDialog.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/ParametersEditDialog.java
index 3e82fc8..eb43510 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/ParametersEditDialog.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/ParametersEditDialog.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/PatternElementSelectionDialog.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/PatternElementSelectionDialog.java
index fa30282..3a4b4e6 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/PatternElementSelectionDialog.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/PatternElementSelectionDialog.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/PatternSelectionDialog.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/PatternSelectionDialog.java
index 5f4685e7..e226d7b 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/PatternSelectionDialog.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/PatternSelectionDialog.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/VariablesEditDialog.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/VariablesEditDialog.java
index a1fae31..05345fd 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/VariablesEditDialog.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/dialogs/VariablesEditDialog.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/editor/MethodsComboBoxViewerCellEditor.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/editor/MethodsComboBoxViewerCellEditor.java
index 008c4bc..8631706 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/editor/MethodsComboBoxViewerCellEditor.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/editor/MethodsComboBoxViewerCellEditor.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/models/QueryContent.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/models/QueryContent.java
index cea98fc..0ffd106 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/models/QueryContent.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/models/QueryContent.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/modifiers/EditingDomainCellModifier.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/modifiers/EditingDomainCellModifier.java
index 1c76883..60abc24 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/modifiers/EditingDomainCellModifier.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/modifiers/EditingDomainCellModifier.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/modifiers/MethodTableCellModifier.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/modifiers/MethodTableCellModifier.java
index b1bf41c..fee772f 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/modifiers/MethodTableCellModifier.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/modifiers/MethodTableCellModifier.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/modifiers/ParametersTableCellModifier.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/modifiers/ParametersTableCellModifier.java
index 70484af..da8e6ec 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/modifiers/ParametersTableCellModifier.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/modifiers/ParametersTableCellModifier.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/modifiers/QueryContentTableCellModifier.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/modifiers/QueryContentTableCellModifier.java
index 461d651..5b1827e 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/modifiers/QueryContentTableCellModifier.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/modifiers/QueryContentTableCellModifier.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/modifiers/VariablesTableCellModifier.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/modifiers/VariablesTableCellModifier.java
index 7b1e3d7..4ffbe55 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/modifiers/VariablesTableCellModifier.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/modifiers/VariablesTableCellModifier.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/pages/DebugPage.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/pages/DebugPage.java
index beba66d..c614d07 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/pages/DebugPage.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/pages/DebugPage.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/pages/ImplementationPage.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/pages/ImplementationPage.java
index e336cdd..a222438 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/pages/ImplementationPage.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/pages/ImplementationPage.java
@@ -1,10 +1,12 @@
 /**
  * <copyright>
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
  * </copyright>
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/pages/OverviewPage.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/pages/OverviewPage.java
index 6bba9f0..952ae44 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/pages/OverviewPage.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/pages/OverviewPage.java
@@ -1,10 +1,12 @@
 /**
  * <copyright>
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
  * </copyright>
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/pages/PatternEditorPage.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/pages/PatternEditorPage.java
index dbbd121..a5aabed 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/pages/PatternEditorPage.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/pages/PatternEditorPage.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/pages/SpecificationPage.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/pages/SpecificationPage.java
index fd67d0d..6aa1482 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/pages/SpecificationPage.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/pages/SpecificationPage.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/ComboListLabelProvider.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/ComboListLabelProvider.java
index 75342f8..bd4ff63 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/ComboListLabelProvider.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/ComboListLabelProvider.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/CommonListContentProvider.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/CommonListContentProvider.java
index f19afd0..d9c3ad7 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/CommonListContentProvider.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/CommonListContentProvider.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/ContainerLibraryLabelProvider.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/ContainerLibraryLabelProvider.java
index 1369f60..d5f4935 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/ContainerLibraryLabelProvider.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/ContainerLibraryLabelProvider.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/MethodLabelProvider.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/MethodLabelProvider.java
index 412edee..0a9d1c6 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/MethodLabelProvider.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/MethodLabelProvider.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/OrchestrationTableLabelProvider.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/OrchestrationTableLabelProvider.java
index 83690e0..d15c4f9 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/OrchestrationTableLabelProvider.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/OrchestrationTableLabelProvider.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/ParameterMatchingLibraryProvider.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/ParameterMatchingLibraryProvider.java
index 64e0fa9..42021d8 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/ParameterMatchingLibraryProvider.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/ParameterMatchingLibraryProvider.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/ParametersTableLabelProvider.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/ParametersTableLabelProvider.java
index b1a15d8..471f738 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/ParametersTableLabelProvider.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/ParametersTableLabelProvider.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/PatternElementLabelProvider.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/PatternElementLabelProvider.java
index bf27a7c..abf3cac 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/PatternElementLabelProvider.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/PatternElementLabelProvider.java
@@ -1,10 +1,13 @@
 /**

  * <copyright>

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

  * XiaoRu Chen, Soyatec

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/PatternElementcontentProvider.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/PatternElementcontentProvider.java
index 2156ca2..86c4b7f 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/PatternElementcontentProvider.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/PatternElementcontentProvider.java
@@ -1,10 +1,12 @@
 /**
  * <copyright>
  * Copyright (c) 2009 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
  * </copyright>
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/PatternSelectionLabelProvider.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/PatternSelectionLabelProvider.java
index 362ad5e..d2d00ac 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/PatternSelectionLabelProvider.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/PatternSelectionLabelProvider.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/TableObservableListContentProvider.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/TableObservableListContentProvider.java
index 2fc751a..ac154d3 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/TableObservableListContentProvider.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/providers/TableObservableListContentProvider.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/selector/DefaultClientSelector.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/selector/DefaultClientSelector.java
index ecc0ab8..91ac880 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/selector/DefaultClientSelector.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/selector/DefaultClientSelector.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/validation/EMFvalidator.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/validation/EMFvalidator.java
index 5b08a8b..9c23333 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/validation/EMFvalidator.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/validation/EMFvalidator.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/validation/NonEmptyNamesConstraint.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/validation/NonEmptyNamesConstraint.java
index c6b4cfb..3db8790 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/validation/NonEmptyNamesConstraint.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/validation/NonEmptyNamesConstraint.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/validation/ParameterNonEmptyNamesConstraint.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/validation/ParameterNonEmptyNamesConstraint.java
index b69cff6..2868b34 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/validation/ParameterNonEmptyNamesConstraint.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/validation/ParameterNonEmptyNamesConstraint.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/validation/PatternNonEmptyNamesConstraint.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/validation/PatternNonEmptyNamesConstraint.java
index 73422d1..78f0408 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/validation/PatternNonEmptyNamesConstraint.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/validation/PatternNonEmptyNamesConstraint.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/validation/ValidationConstants.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/validation/ValidationConstants.java
index 0ccba8b..a6c73f4 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/validation/ValidationConstants.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/validation/ValidationConstants.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/validation/VariableNonEmptyNamesConstraint.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/validation/VariableNonEmptyNamesConstraint.java
index 315b383..4ab492f 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/validation/VariableNonEmptyNamesConstraint.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/validation/VariableNonEmptyNamesConstraint.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/OpenTypeWizard.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/OpenTypeWizard.java
index 09f2452..818c3b2 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/OpenTypeWizard.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/OpenTypeWizard.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/OrchestrationWizard.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/OrchestrationWizard.java
index 86ae2c7..3277f7a 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/OrchestrationWizard.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/OrchestrationWizard.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/pages/CallTypeEnum.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/pages/CallTypeEnum.java
index 333531c..c71f439 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/pages/CallTypeEnum.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/pages/CallTypeEnum.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/pages/ChooseCallPage.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/pages/ChooseCallPage.java
index 28112ca..e324e47 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/pages/ChooseCallPage.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/pages/ChooseCallPage.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/pages/ChooseKindPage.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/pages/ChooseKindPage.java
index f688a5d..acdec8d 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/pages/ChooseKindPage.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/pages/ChooseKindPage.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/pages/ChooseMethodCallPage.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/pages/ChooseMethodCallPage.java
index 2b1431c..f5b864a 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/pages/ChooseMethodCallPage.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/pages/ChooseMethodCallPage.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/pages/ChooseTypePage.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/pages/ChooseTypePage.java
index 3fa7fc9..867f481 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/pages/ChooseTypePage.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/pages/ChooseTypePage.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S. and other

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/pages/ParameterMatchingPage.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/pages/ParameterMatchingPage.java
index f3e9865..d7d5d04 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/pages/ParameterMatchingPage.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/editors/wizards/pages/ParameterMatchingPage.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/extension/ExtensionUIHelper.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/extension/ExtensionUIHelper.java
index 7623103..ed49fc8 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/extension/ExtensionUIHelper.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/extension/ExtensionUIHelper.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/trace/StringEditingSupport.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/trace/StringEditingSupport.java
index 12c951c..69825b1 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/trace/StringEditingSupport.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/trace/StringEditingSupport.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/trace/TraceCategoryLabelProvider.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/trace/TraceCategoryLabelProvider.java
index 5e26d59..a40c88c 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/trace/TraceCategoryLabelProvider.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/trace/TraceCategoryLabelProvider.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/trace/TraceContentProvider.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/trace/TraceContentProvider.java
index a39d1a2..7827146 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/trace/TraceContentProvider.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/trace/TraceContentProvider.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/trace/TraceFilterLabelProvider.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/trace/TraceFilterLabelProvider.java
index 5fba351..5cca449 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/trace/TraceFilterLabelProvider.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/trace/TraceFilterLabelProvider.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/trace/TracePreferencePage.java b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/trace/TracePreferencePage.java
index 29d80d6..89ddded 100644
--- a/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/trace/TracePreferencePage.java
+++ b/plugins/org.eclipse.egf.pattern.ui/src/org/eclipse/egf/pattern/ui/trace/TracePreferencePage.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern/build.properties b/plugins/org.eclipse.egf.pattern/build.properties
index 19c9dc6..0813fb2 100644
--- a/plugins/org.eclipse.egf.pattern/build.properties
+++ b/plugins/org.eclipse.egf.pattern/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/plugin.properties b/plugins/org.eclipse.egf.pattern/plugin.properties
index 57288a9..e3ae516 100644
--- a/plugins/org.eclipse.egf.pattern/plugin.properties
+++ b/plugins/org.eclipse.egf.pattern/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/EGFPatternPlugin.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/EGFPatternPlugin.java
index 9b5cd54..21550db 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/EGFPatternPlugin.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/EGFPatternPlugin.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/collector/PatternCollector.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/collector/PatternCollector.java
index 389ad1e..ca7522b 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/collector/PatternCollector.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/collector/PatternCollector.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/collector/PatternElementCollector.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/collector/PatternElementCollector.java
index fb08311..3a281f9 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/collector/PatternElementCollector.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/collector/PatternElementCollector.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/collector/PatternLibraryCollector.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/collector/PatternLibraryCollector.java
index caf2999..57d28c6 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/collector/PatternLibraryCollector.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/collector/PatternLibraryCollector.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/common/java/AbstractJavaAssemblyContentProvider.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/common/java/AbstractJavaAssemblyContentProvider.java
index 3189060..f0cc62d 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/common/java/AbstractJavaAssemblyContentProvider.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/common/java/AbstractJavaAssemblyContentProvider.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/common/java/AbstractJavaEngine.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/common/java/AbstractJavaEngine.java
index 9c02a77..8cfad51 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/common/java/AbstractJavaEngine.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/common/java/AbstractJavaEngine.java
@@ -1,10 +1,12 @@
 /**
  * <copyright>
  * Copyright (c) 2009 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
  * </copyright>
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/common/java/BaseJavaAssemblyHelper.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/common/java/BaseJavaAssemblyHelper.java
index 0541d24..c970264 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/common/java/BaseJavaAssemblyHelper.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/common/java/BaseJavaAssemblyHelper.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/AssemblyContentHelper.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/AssemblyContentHelper.java
index b62e230..af27bdd 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/AssemblyContentHelper.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/AssemblyContentHelper.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/AssemblyContentProvider.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/AssemblyContentProvider.java
index c74774a..f90dfdb 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/AssemblyContentProvider.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/AssemblyContentProvider.java
@@ -1,10 +1,12 @@
 /**
  * <copyright>
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
  * </copyright>
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/AssemblyHelper.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/AssemblyHelper.java
index a48b9d7..670997d 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/AssemblyHelper.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/AssemblyHelper.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/ParameterMatcher.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/ParameterMatcher.java
index 498f2b3..f9a680a 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/ParameterMatcher.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/ParameterMatcher.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/PatternEngine.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/PatternEngine.java
index 0cd02e5..216972f 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/PatternEngine.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/PatternEngine.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/PatternHelper.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/PatternHelper.java
index cb85ba2..8a21f71 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/PatternHelper.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/PatternHelper.java
@@ -1,10 +1,12 @@
 /**
  * <copyright>
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
  * </copyright>
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/PatternIDHelper.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/PatternIDHelper.java
index af32562..1649683 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/PatternIDHelper.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/PatternIDHelper.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/TranslationHelper.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/TranslationHelper.java
index 1ee4eac..319101b 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/TranslationHelper.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/engine/TranslationHelper.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/CallHelper.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/CallHelper.java
index d980b8b..2129182 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/CallHelper.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/CallHelper.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/CallbackContext.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/CallbackContext.java
index e833976..5d86673 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/CallbackContext.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/CallbackContext.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/ConsoleReporter.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/ConsoleReporter.java
index f82f47c..8f2832f 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/ConsoleReporter.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/ConsoleReporter.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/DefaultInternalPatternContext.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/DefaultInternalPatternContext.java
index e8febb3..ca2ef42 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/DefaultInternalPatternContext.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/DefaultInternalPatternContext.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/DefaultPatternContext.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/DefaultPatternContext.java
index 44cf0c2..ca6c619 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/DefaultPatternContext.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/DefaultPatternContext.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/EclipseFileReporter.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/EclipseFileReporter.java
index 2bb1bf2..5a90bab 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/EclipseFileReporter.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/EclipseFileReporter.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/ExecutionContext.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/ExecutionContext.java
index b164e01..b81ee2d 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/ExecutionContext.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/ExecutionContext.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/IndexValue.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/IndexValue.java
index 5a14953..8f587ce 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/IndexValue.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/IndexValue.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/InternalPatternContext.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/InternalPatternContext.java
index 72052d6..b7769e1 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/InternalPatternContext.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/InternalPatternContext.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/OutputManager.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/OutputManager.java
index 046c645..c8cbd81 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/OutputManager.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/OutputManager.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/QueryHelper.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/QueryHelper.java
index 573a435..51e876d 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/QueryHelper.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/QueryHelper.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/SuperOrchestrationContext.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/SuperOrchestrationContext.java
index 86e2d37..e62e25d 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/SuperOrchestrationContext.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/execution/SuperOrchestrationContext.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/extension/BasePatternInitializer.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/extension/BasePatternInitializer.java
index a775d4f..e269e18 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/extension/BasePatternInitializer.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/extension/BasePatternInitializer.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/extension/ExtensionHelper.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/extension/ExtensionHelper.java
index e4cc39b..a1f1dbe 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/extension/ExtensionHelper.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/extension/ExtensionHelper.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/extension/PatternExtension.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/extension/PatternExtension.java
index 281a342..67e13e4 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/extension/PatternExtension.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/extension/PatternExtension.java
@@ -1,10 +1,12 @@
 /**
  * <copyright>
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
  * </copyright>
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/extension/PatternFactory.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/extension/PatternFactory.java
index 06b805f..5321b79 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/extension/PatternFactory.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/extension/PatternFactory.java
@@ -1,10 +1,12 @@
 /**
  * <copyright>
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
  * </copyright>
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/extension/PatternInitializer.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/extension/PatternInitializer.java
index b393d04..bba322f 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/extension/PatternInitializer.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/extension/PatternInitializer.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/extension/TemplateInitializer.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/extension/TemplateInitializer.java
index 7a545e5..6e365ee 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/extension/TemplateInitializer.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/extension/TemplateInitializer.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/internal/registry/PatternExtensionProxy.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/internal/registry/PatternExtensionProxy.java
index 95d0386..341e99e 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/internal/registry/PatternExtensionProxy.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/internal/registry/PatternExtensionProxy.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/internal/registry/PatternExtensionRegistry.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/internal/registry/PatternExtensionRegistry.java
index 623e8c8..5a0c420 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/internal/registry/PatternExtensionRegistry.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/internal/registry/PatternExtensionRegistry.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/l10n/EGFPatternMessages.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/l10n/EGFPatternMessages.java
index c40db58..f583c76 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/l10n/EGFPatternMessages.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/l10n/EGFPatternMessages.java
@@ -1,10 +1,12 @@
 /**
  * <copyright>
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
  * </copyright>
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/query/BasicQueryDelegate.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/query/BasicQueryDelegate.java
index 3ef20af..b0a892f 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/query/BasicQueryDelegate.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/query/BasicQueryDelegate.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/query/EObjectInjectedContextQuery.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/query/EObjectInjectedContextQuery.java
index 5da032f..f0a8c9f 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/query/EObjectInjectedContextQuery.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/query/EObjectInjectedContextQuery.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/query/IQuery.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/query/IQuery.java
index 22b5a13..9ea6ff9 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/query/IQuery.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/query/IQuery.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/query/QueryFactory.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/query/QueryFactory.java
index d4a76fb..355b2f1 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/query/QueryFactory.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/query/QueryFactory.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/query/QueryKind.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/query/QueryKind.java
index 8a14143..4baa561 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/query/QueryKind.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/query/QueryKind.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/AbstractPatternStrategy.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/AbstractPatternStrategy.java
index 7aec646..cd9882c 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/AbstractPatternStrategy.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/AbstractPatternStrategy.java
@@ -1,10 +1,12 @@
 /**
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/AbstractStrategy.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/AbstractStrategy.java
index f25ccc4..525625a 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/AbstractStrategy.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/AbstractStrategy.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/DefaultStrategy.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/DefaultStrategy.java
index 18de004..1c763d6 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/DefaultStrategy.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/DefaultStrategy.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/domaindriven/AbstractDomainVisitor.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/domaindriven/AbstractDomainVisitor.java
index 79718a9..7927fd6 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/domaindriven/AbstractDomainVisitor.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/domaindriven/AbstractDomainVisitor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/domaindriven/DefaultDomainVisitor.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/domaindriven/DefaultDomainVisitor.java
index c65a83c..d8e3529 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/domaindriven/DefaultDomainVisitor.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/domaindriven/DefaultDomainVisitor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/domaindriven/DomainDrivenCallBackHandler.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/domaindriven/DomainDrivenCallBackHandler.java
index 1d712ba..828841c 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/domaindriven/DomainDrivenCallBackHandler.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/domaindriven/DomainDrivenCallBackHandler.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/domaindriven/DomainDrivenStrategy.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/domaindriven/DomainDrivenStrategy.java
index 1a78878..3839a99 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/domaindriven/DomainDrivenStrategy.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/domaindriven/DomainDrivenStrategy.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/domaindriven/SubClassEmfModelVisitor.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/domaindriven/SubClassEmfModelVisitor.java
index fb7004d..70e6441 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/domaindriven/SubClassEmfModelVisitor.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/strategy/domaindriven/SubClassEmfModelVisitor.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/templates/SimpleEngine.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/templates/SimpleEngine.java
index 33e319f..04f3bcc 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/templates/SimpleEngine.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/templates/SimpleEngine.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/templates/TemplateEngine.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/templates/TemplateEngine.java
index 7e30098..f2ebd94 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/templates/TemplateEngine.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/templates/TemplateEngine.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/templates/TemplateProcessor.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/templates/TemplateProcessor.java
index 2b2ea31..4477d20 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/templates/TemplateProcessor.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/templates/TemplateProcessor.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/trace/ITracePreferences.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/trace/ITracePreferences.java
index eec23cf..0b13087 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/trace/ITracePreferences.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/trace/ITracePreferences.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/trace/TraceHelper.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/trace/TraceHelper.java
index 4bcc055..223fc6f 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/trace/TraceHelper.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/trace/TraceHelper.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/trace/TracePatternOutputProcessor.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/trace/TracePatternOutputProcessor.java
index 199ec78..6a1364a 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/trace/TracePatternOutputProcessor.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/trace/TracePatternOutputProcessor.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/trace/TracePreferencesManager.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/trace/TracePreferencesManager.java
index f230fab..8127246 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/trace/TracePreferencesManager.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/trace/TracePreferencesManager.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/trace/TraceState.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/trace/TraceState.java
index 0b8d28c..7999e2a 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/trace/TraceState.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/trace/TraceState.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/utils/JavaMethodGenerationHelper.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/utils/JavaMethodGenerationHelper.java
index 7fa1bf4..382f897 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/utils/JavaMethodGenerationHelper.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/utils/JavaMethodGenerationHelper.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/utils/ParameterTypeHelper.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/utils/ParameterTypeHelper.java
index e852946..01b68c7 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/utils/ParameterTypeHelper.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/utils/ParameterTypeHelper.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/utils/RuntimeParameterTypeHelper.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/utils/RuntimeParameterTypeHelper.java
index 672a1a7..71ca4c3 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/utils/RuntimeParameterTypeHelper.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/utils/RuntimeParameterTypeHelper.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/utils/SubstitutionHelper.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/utils/SubstitutionHelper.java
index fb1d5e3..86f25b3 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/utils/SubstitutionHelper.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/utils/SubstitutionHelper.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/utils/TemplateFileHelper.java b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/utils/TemplateFileHelper.java
index 03495e7..c53f4ee 100644
--- a/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/utils/TemplateFileHelper.java
+++ b/plugins/org.eclipse.egf.pattern/src/org/eclipse/egf/pattern/utils/TemplateFileHelper.java
@@ -1,9 +1,11 @@
 /**

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.fprod/build.properties b/plugins/org.eclipse.egf.producer.fprod/build.properties
index 7569fbf..974fcc7 100644
--- a/plugins/org.eclipse.egf.producer.fprod/build.properties
+++ b/plugins/org.eclipse.egf.producer.fprod/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.fprod/plugin.properties b/plugins/org.eclipse.egf.producer.fprod/plugin.properties
index bf358f2..2127963 100644
--- a/plugins/org.eclipse.egf.producer.fprod/plugin.properties
+++ b/plugins/org.eclipse.egf.producer.fprod/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.fprod/plugin.xml b/plugins/org.eclipse.egf.producer.fprod/plugin.xml
index d7d104e..c417713 100644
--- a/plugins/org.eclipse.egf.producer.fprod/plugin.xml
+++ b/plugins/org.eclipse.egf.producer.fprod/plugin.xml
Binary files differ
diff --git a/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/context/IProductionPlanInvocationProductionContext.java b/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/context/IProductionPlanInvocationProductionContext.java
index ad8d767..81a9632 100644
--- a/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/context/IProductionPlanInvocationProductionContext.java
+++ b/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/context/IProductionPlanInvocationProductionContext.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/context/IProductionPlanProductionContext.java b/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/context/IProductionPlanProductionContext.java
index c4fce79..d1712f8 100644
--- a/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/context/IProductionPlanProductionContext.java
+++ b/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/context/IProductionPlanProductionContext.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/context/FactoryComponentProductionContextProducer.java b/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/context/FactoryComponentProductionContextProducer.java
index c462476..a2662c7 100644
--- a/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/context/FactoryComponentProductionContextProducer.java
+++ b/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/context/FactoryComponentProductionContextProducer.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/context/ProducerFprodContextFactory.java b/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/context/ProducerFprodContextFactory.java
index 3a8f155..ea2a408 100644
--- a/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/context/ProducerFprodContextFactory.java
+++ b/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/context/ProducerFprodContextFactory.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/context/ProductionPlanInvocationProductionContext.java b/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/context/ProductionPlanInvocationProductionContext.java
index 2f98ced..8bc0ae0 100644
--- a/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/context/ProductionPlanInvocationProductionContext.java
+++ b/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/context/ProductionPlanInvocationProductionContext.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/context/ProductionPlanProductionContext.java b/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/context/ProductionPlanProductionContext.java
index 7bbf07e..c1f9a4b 100644
--- a/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/context/ProductionPlanProductionContext.java
+++ b/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/context/ProductionPlanProductionContext.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/manager/ProductionPlanInvocationManager.java b/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/manager/ProductionPlanInvocationManager.java
index 68cacec..0ea0e80 100644
--- a/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/manager/ProductionPlanInvocationManager.java
+++ b/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/manager/ProductionPlanInvocationManager.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/manager/ProductionPlanManager.java b/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/manager/ProductionPlanManager.java
index dee9966..629971a 100644
--- a/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/manager/ProductionPlanManager.java
+++ b/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/manager/ProductionPlanManager.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/manager/ProductionPlanManagerFactory.java b/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/manager/ProductionPlanManagerFactory.java
index ba27561..c9e627d 100644
--- a/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/manager/ProductionPlanManagerFactory.java
+++ b/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/manager/ProductionPlanManagerFactory.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/manager/ProductionPlanManagerProducer.java b/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/manager/ProductionPlanManagerProducer.java
index f667349..101d873 100644
--- a/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/manager/ProductionPlanManagerProducer.java
+++ b/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/internal/manager/ProductionPlanManagerProducer.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/l10n/FprodProducerMessages.java b/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/l10n/FprodProducerMessages.java
index 9afe4c3..7ff078e 100644
--- a/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/l10n/FprodProducerMessages.java
+++ b/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/l10n/FprodProducerMessages.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2000, 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

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/l10n/messages.properties b/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/l10n/messages.properties
index 9744cb1..d735071 100644
--- a/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/l10n/messages.properties
+++ b/plugins/org.eclipse.egf.producer.fprod/src/org/eclipse/egf/producer/fprod/l10n/messages.properties
@@ -1,9 +1,12 @@
 ##

-# Copyright (c) 2000, 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

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+#  Copyright (c) 2000, 2009 IBM Corporation and others.

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 # Contributors:

 #     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.ftask/build.properties b/plugins/org.eclipse.egf.producer.ftask/build.properties
index 7569fbf..974fcc7 100644
--- a/plugins/org.eclipse.egf.producer.ftask/build.properties
+++ b/plugins/org.eclipse.egf.producer.ftask/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.ftask/plugin.properties b/plugins/org.eclipse.egf.producer.ftask/plugin.properties
index 86615ef..5ec6d1f 100644
--- a/plugins/org.eclipse.egf.producer.ftask/plugin.properties
+++ b/plugins/org.eclipse.egf.producer.ftask/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.ftask/plugin.xml b/plugins/org.eclipse.egf.producer.ftask/plugin.xml
index 0dc0b6d..2681f8a 100644
--- a/plugins/org.eclipse.egf.producer.ftask/plugin.xml
+++ b/plugins/org.eclipse.egf.producer.ftask/plugin.xml
Binary files differ
diff --git a/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/context/ProducerFtaskContextFactory.java b/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/context/ProducerFtaskContextFactory.java
index 1871d52..d3f30b1 100644
--- a/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/context/ProducerFtaskContextFactory.java
+++ b/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/context/ProducerFtaskContextFactory.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/context/TaskProductionContext.java b/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/context/TaskProductionContext.java
index 85f3aca..3de327f 100644
--- a/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/context/TaskProductionContext.java
+++ b/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/context/TaskProductionContext.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/context/TaskProductionContextProducer.java b/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/context/TaskProductionContextProducer.java
index e663fe0..1804e77 100644
--- a/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/context/TaskProductionContextProducer.java
+++ b/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/context/TaskProductionContextProducer.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/invocation/TaskProductionInvocation.java b/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/invocation/TaskProductionInvocation.java
index ab3d0b3..b4218cb 100644
--- a/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/invocation/TaskProductionInvocation.java
+++ b/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/invocation/TaskProductionInvocation.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/manager/TaskManager.java b/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/manager/TaskManager.java
index fc88391..3b74ffa 100644
--- a/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/manager/TaskManager.java
+++ b/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/manager/TaskManager.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/manager/TaskManagerProducer.java b/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/manager/TaskManagerProducer.java
index edd928f..f9de775 100644
--- a/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/manager/TaskManagerProducer.java
+++ b/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/manager/TaskManagerProducer.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/task/TaskProductionInvocationFactory.java b/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/task/TaskProductionInvocationFactory.java
index d7429c9..f36e61a 100644
--- a/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/task/TaskProductionInvocationFactory.java
+++ b/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/internal/task/TaskProductionInvocationFactory.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/invocation/ITaskProductionInvocation.java b/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/invocation/ITaskProductionInvocation.java
index 9e1fbab..b5a38f3 100644
--- a/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/invocation/ITaskProductionInvocation.java
+++ b/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/invocation/ITaskProductionInvocation.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/manager/TaskManagerFactory.java b/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/manager/TaskManagerFactory.java
index bb85dfe..448ac5f 100644
--- a/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/manager/TaskManagerFactory.java
+++ b/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/manager/TaskManagerFactory.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/task/ITaskProductionInvocationFactory.java b/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/task/ITaskProductionInvocationFactory.java
index 30e7959..cafdc92 100644
--- a/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/task/ITaskProductionInvocationFactory.java
+++ b/plugins/org.eclipse.egf.producer.ftask/src/org/eclipse/egf/producer/ftask/task/ITaskProductionInvocationFactory.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.ui/build.properties b/plugins/org.eclipse.egf.producer.ui/build.properties
index 36be418..0d7578b 100644
--- a/plugins/org.eclipse.egf.producer.ui/build.properties
+++ b/plugins/org.eclipse.egf.producer.ui/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.ui/plugin.properties b/plugins/org.eclipse.egf.producer.ui/plugin.properties
index a62bf7a..a3f788d 100644
--- a/plugins/org.eclipse.egf.producer.ui/plugin.properties
+++ b/plugins/org.eclipse.egf.producer.ui/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/decorators/MandatoryLabelDecorator.java b/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/decorators/MandatoryLabelDecorator.java
index b56aa0c..1de6ffa 100644
--- a/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/decorators/MandatoryLabelDecorator.java
+++ b/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/decorators/MandatoryLabelDecorator.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/internal/actions/CopyHeadlessShortcutToClipboardAction.java b/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/internal/actions/CopyHeadlessShortcutToClipboardAction.java
index e282e06..79ef668 100644
--- a/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/internal/actions/CopyHeadlessShortcutToClipboardAction.java
+++ b/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/internal/actions/CopyHeadlessShortcutToClipboardAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2000, 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
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/internal/actions/GlobalRunActivityAction.java b/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/internal/actions/GlobalRunActivityAction.java
index 3c06eca..a4a788d 100644
--- a/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/internal/actions/GlobalRunActivityAction.java
+++ b/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/internal/actions/GlobalRunActivityAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2000, 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
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/internal/actions/RunActivityAction.java b/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/internal/actions/RunActivityAction.java
index 98a5c92..33df676 100644
--- a/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/internal/actions/RunActivityAction.java
+++ b/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/internal/actions/RunActivityAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2000, 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
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/internal/dialogs/ActivityValidationSelectionDialog.java b/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/internal/dialogs/ActivityValidationSelectionDialog.java
index 8cfec48..08e4f17 100644
--- a/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/internal/dialogs/ActivityValidationSelectionDialog.java
+++ b/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/internal/dialogs/ActivityValidationSelectionDialog.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/internal/ui/IProducerUIImages.java b/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/internal/ui/IProducerUIImages.java
index 455fcee..9abf24a 100644
--- a/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/internal/ui/IProducerUIImages.java
+++ b/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/internal/ui/IProducerUIImages.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2000, 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
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  */
 package org.eclipse.egf.producer.ui.internal.ui;
diff --git a/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/l10n/ProducerUIMessages.java b/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/l10n/ProducerUIMessages.java
index ea03d7a..073daaf 100644
--- a/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/l10n/ProducerUIMessages.java
+++ b/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/l10n/ProducerUIMessages.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2000, 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

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/l10n/messages.properties b/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/l10n/messages.properties
index c0284f3..81550b0 100644
--- a/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/l10n/messages.properties
+++ b/plugins/org.eclipse.egf.producer.ui/src/org/eclipse/egf/producer/ui/l10n/messages.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/build.properties b/plugins/org.eclipse.egf.producer/build.properties
index 3fe0827..31c949a 100644
--- a/plugins/org.eclipse.egf.producer/build.properties
+++ b/plugins/org.eclipse.egf.producer/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/plugin.properties b/plugins/org.eclipse.egf.producer/plugin.properties
index eb187b9..b952c4a 100644
--- a/plugins/org.eclipse.egf.producer/plugin.properties
+++ b/plugins/org.eclipse.egf.producer/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/plugin.xml b/plugins/org.eclipse.egf.producer/plugin.xml
index e9f4691..30eb24f 100644
--- a/plugins/org.eclipse.egf.producer/plugin.xml
+++ b/plugins/org.eclipse.egf.producer/plugin.xml
Binary files differ
diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/context/ActivityProductionContextProducer.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/context/ActivityProductionContextProducer.java
index bd990aa..d59c289 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/context/ActivityProductionContextProducer.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/context/ActivityProductionContextProducer.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/context/IActivityProductionContext.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/context/IActivityProductionContext.java
index 7878514..1585c50 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/context/IActivityProductionContext.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/context/IActivityProductionContext.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/context/IFactoryComponentProductionContext.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/context/IFactoryComponentProductionContext.java
index e52aa4d..2d53822 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/context/IFactoryComponentProductionContext.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/context/IFactoryComponentProductionContext.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/context/IInvocationProductionContext.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/context/IInvocationProductionContext.java
index 35088fc..0b6513b 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/context/IInvocationProductionContext.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/context/IInvocationProductionContext.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/context/IModelElementProductionContext.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/context/IModelElementProductionContext.java
index d5c8295..f25db32 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/context/IModelElementProductionContext.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/context/IModelElementProductionContext.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/context/IOrchestrationProductionContext.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/context/IOrchestrationProductionContext.java
index dadae4c..bf1d1a1 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/context/IOrchestrationProductionContext.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/context/IOrchestrationProductionContext.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/context/ActivityProductionContext.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/context/ActivityProductionContext.java
index 720fd12..7c8c8e7 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/context/ActivityProductionContext.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/context/ActivityProductionContext.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/context/FactoryComponentProductionContext.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/context/FactoryComponentProductionContext.java
index 6bc32b3..f059d95 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/context/FactoryComponentProductionContext.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/context/FactoryComponentProductionContext.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/context/InvocationProductionContext.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/context/InvocationProductionContext.java
index 8bb928d..65c2339 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/context/InvocationProductionContext.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/context/InvocationProductionContext.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/context/ModelElementProductionContext.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/context/ModelElementProductionContext.java
index 37a9990..0a66246 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/context/ModelElementProductionContext.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/context/ModelElementProductionContext.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/context/OrchestrationProductionContext.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/context/OrchestrationProductionContext.java
index 075beae..3c16cf3 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/context/OrchestrationProductionContext.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/context/OrchestrationProductionContext.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/context/ProducerContextFactory.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/context/ProducerContextFactory.java
index d062356..7deb0c7 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/context/ProducerContextFactory.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/context/ProducerContextFactory.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/manager/ActivityManager.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/manager/ActivityManager.java
index d10f1e4..dcd729e 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/manager/ActivityManager.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/manager/ActivityManager.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/manager/FactoryComponentManager.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/manager/FactoryComponentManager.java
index 5f5f48e..d430b17 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/manager/FactoryComponentManager.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/manager/FactoryComponentManager.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/manager/FactoryComponentManagerProducer.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/manager/FactoryComponentManagerProducer.java
index 4648a46..bb91cc0 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/manager/FactoryComponentManagerProducer.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/manager/FactoryComponentManagerProducer.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/manager/InvocationManager.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/manager/InvocationManager.java
index f2e40ef..7849b86 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/manager/InvocationManager.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/manager/InvocationManager.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/manager/ModelElementManager.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/manager/ModelElementManager.java
index ae7f129..dd85d6a 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/manager/ModelElementManager.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/manager/ModelElementManager.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/manager/OrchestrationManager.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/manager/OrchestrationManager.java
index f4389af..6fb095f 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/manager/OrchestrationManager.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/manager/OrchestrationManager.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/registry/ActivityManagerProducerProxy.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/registry/ActivityManagerProducerProxy.java
index 6bca750..6f6828c 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/registry/ActivityManagerProducerProxy.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/registry/ActivityManagerProducerProxy.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/registry/ActivityManagerProducerRegistry.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/registry/ActivityManagerProducerRegistry.java
index c257b93..928a2be 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/registry/ActivityManagerProducerRegistry.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/registry/ActivityManagerProducerRegistry.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/registry/ActivityProductionContextProducerProxy.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/registry/ActivityProductionContextProducerProxy.java
index 01b51bb..b65ab5c 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/registry/ActivityProductionContextProducerProxy.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/registry/ActivityProductionContextProducerProxy.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/registry/ActivityProductionContextProducerRegistry.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/registry/ActivityProductionContextProducerRegistry.java
index c0bb07f..51ae40c 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/registry/ActivityProductionContextProducerRegistry.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/registry/ActivityProductionContextProducerRegistry.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/registry/OrchestrationManagerProducerProxy.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/registry/OrchestrationManagerProducerProxy.java
index c466797..15ecced 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/registry/OrchestrationManagerProducerProxy.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/registry/OrchestrationManagerProducerProxy.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/registry/OrchestrationManagerProducerRegistry.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/registry/OrchestrationManagerProducerRegistry.java
index 536c6d3..578691b 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/registry/OrchestrationManagerProducerRegistry.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/internal/registry/OrchestrationManagerProducerRegistry.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/l10n/ProducerMessages.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/l10n/ProducerMessages.java
index a6a304a..b3676d7 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/l10n/ProducerMessages.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/l10n/ProducerMessages.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2000, 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

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/l10n/messages.properties b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/l10n/messages.properties
index 0ab4710..bd92fcf 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/l10n/messages.properties
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/l10n/messages.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/manager/ActivityManagerProducer.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/manager/ActivityManagerProducer.java
index 48b0c92..23e75f3 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/manager/ActivityManagerProducer.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/manager/ActivityManagerProducer.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/manager/FactoryComponentManagerFactory.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/manager/FactoryComponentManagerFactory.java
index 302d6da..3926f6b 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/manager/FactoryComponentManagerFactory.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/manager/FactoryComponentManagerFactory.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/manager/IActivityManager.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/manager/IActivityManager.java
index c8dc43c..24ac145 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/manager/IActivityManager.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/manager/IActivityManager.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/manager/IModelElementManager.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/manager/IModelElementManager.java
index 31d4419..48389e9 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/manager/IModelElementManager.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/manager/IModelElementManager.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/manager/OrchestrationManagerProducer.java b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/manager/OrchestrationManagerProducer.java
index 361686c..72421a5 100644
--- a/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/manager/OrchestrationManagerProducer.java
+++ b/plugins/org.eclipse.egf.producer/src/org/eclipse/egf/producer/manager/OrchestrationManagerProducer.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.task.ui/build.properties b/plugins/org.eclipse.egf.task.ui/build.properties
index 5629f2c..1439811 100644
--- a/plugins/org.eclipse.egf.task.ui/build.properties
+++ b/plugins/org.eclipse.egf.task.ui/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.task.ui/plugin.properties b/plugins/org.eclipse.egf.task.ui/plugin.properties
index 50e0d95..db3ad01 100644
--- a/plugins/org.eclipse.egf.task.ui/plugin.properties
+++ b/plugins/org.eclipse.egf.task.ui/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/EGFTaskUIPlugin.java b/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/EGFTaskUIPlugin.java
index bdd452c..291fc71 100644
--- a/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/EGFTaskUIPlugin.java
+++ b/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/EGFTaskUIPlugin.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/AbstractTaskEditorContributor.java b/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/AbstractTaskEditorContributor.java
index 498e53f..8f15ad4 100644
--- a/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/AbstractTaskEditorContributor.java
+++ b/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/AbstractTaskEditorContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/OpenJavaTaskImplementationListenerContributor.java b/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/OpenJavaTaskImplementationListenerContributor.java
index ed3045f..8441bb2 100644
--- a/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/OpenJavaTaskImplementationListenerContributor.java
+++ b/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/OpenJavaTaskImplementationListenerContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/OpenJavaTaskImplementationMenuContributor.java b/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/OpenJavaTaskImplementationMenuContributor.java
index 39e7715..91b540f 100644
--- a/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/OpenJavaTaskImplementationMenuContributor.java
+++ b/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/OpenJavaTaskImplementationMenuContributor.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/TaskImplementationOpenAction.java b/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/TaskImplementationOpenAction.java
index 66b99be..d92f4ff 100644
--- a/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/TaskImplementationOpenAction.java
+++ b/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/TaskImplementationOpenAction.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/TaskJavaEditorContributor.java b/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/TaskJavaEditorContributor.java
index 9d23903..97e94da 100644
--- a/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/TaskJavaEditorContributor.java
+++ b/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/TaskJavaEditorContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/TaskListenerContributor.java b/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/TaskListenerContributor.java
index fc778eb..a370597 100644
--- a/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/TaskListenerContributor.java
+++ b/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/TaskListenerContributor.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/TaskMenuContributor.java b/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/TaskMenuContributor.java
index e815975..5f6e600 100644
--- a/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/TaskMenuContributor.java
+++ b/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/contributions/TaskMenuContributor.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/l10n/EGFTaskUIMessages.java b/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/l10n/EGFTaskUIMessages.java
index 477e1f9..7110514 100644
--- a/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/l10n/EGFTaskUIMessages.java
+++ b/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/l10n/EGFTaskUIMessages.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/l10n/messages.properties b/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/l10n/messages.properties
index be7d35f..e2a4844 100644
--- a/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/l10n/messages.properties
+++ b/plugins/org.eclipse.egf.task.ui/src/org/eclipse/egf/task/ui/l10n/messages.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.task/build.properties b/plugins/org.eclipse.egf.task/build.properties
index 5629f2c..1439811 100644
--- a/plugins/org.eclipse.egf.task/build.properties
+++ b/plugins/org.eclipse.egf.task/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.task/plugin.properties b/plugins/org.eclipse.egf.task/plugin.properties
index 40c23c9..abed5b3 100644
--- a/plugins/org.eclipse.egf.task/plugin.properties
+++ b/plugins/org.eclipse.egf.task/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.egf.task/src/org/eclipse/egf/task/EGFTaskPlugin.java b/plugins/org.eclipse.egf.task/src/org/eclipse/egf/task/EGFTaskPlugin.java
index ffb78ae..a411391 100644
--- a/plugins/org.eclipse.egf.task/src/org/eclipse/egf/task/EGFTaskPlugin.java
+++ b/plugins/org.eclipse.egf.task/src/org/eclipse/egf/task/EGFTaskPlugin.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.task/src/org/eclipse/egf/task/internal/nature/TaskNatureJava.java b/plugins/org.eclipse.egf.task/src/org/eclipse/egf/task/internal/nature/TaskNatureJava.java
index 6cc9045..c6980ec 100644
--- a/plugins/org.eclipse.egf.task/src/org/eclipse/egf/task/internal/nature/TaskNatureJava.java
+++ b/plugins/org.eclipse.egf.task/src/org/eclipse/egf/task/internal/nature/TaskNatureJava.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.task/src/org/eclipse/egf/task/l10n/EGFTaskMessages.java b/plugins/org.eclipse.egf.task/src/org/eclipse/egf/task/l10n/EGFTaskMessages.java
index 2230a05..269c0b1 100644
--- a/plugins/org.eclipse.egf.task/src/org/eclipse/egf/task/l10n/EGFTaskMessages.java
+++ b/plugins/org.eclipse.egf.task/src/org/eclipse/egf/task/l10n/EGFTaskMessages.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.egf.task/src/org/eclipse/egf/task/l10n/messages.properties b/plugins/org.eclipse.egf.task/src/org/eclipse/egf/task/l10n/messages.properties
index 56a0528..720fa4b 100644
--- a/plugins/org.eclipse.egf.task/src/org/eclipse/egf/task/l10n/messages.properties
+++ b/plugins/org.eclipse.egf.task/src/org/eclipse/egf/task/l10n/messages.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/plugins/org.eclipse.jet.editor/about.properties b/plugins/org.eclipse.jet.editor/about.properties
index 44e0c11..5ea7340 100644
--- a/plugins/org.eclipse.jet.editor/about.properties
+++ b/plugins/org.eclipse.jet.editor/about.properties
@@ -1,9 +1,12 @@
 ###############################################################################

-# Copyright (c) 2006, 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

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+#  Copyright (c) 2006, 2008 IBM Corporation and others.

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 #

 # Contributors:

 #     IBM Corporation - initial API and implementation

diff --git a/plugins/pom.xml b/plugins/pom.xml
index 0d26101..f7b33fc 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2018 THALES GLOBAL SERVICES.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
   which accompanies this distribution, and is available at
-  http://www.eclipse.org/legal/epl-v10.html
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 
   Contributors:
        Thales - initial API and implementation
diff --git a/pom.xml b/pom.xml
index 62db9ea..1976ed3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2018, 2019 THALES GLOBAL SERVICES.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
   which accompanies this distribution, and is available at
-  http://www.eclipse.org/legal/epl-v10.html
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 
   Contributors:
        Thales - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.eclipse.resources.mgt/build.properties b/portfolio/org.eclipse.egf.eclipse.resources.mgt/build.properties
index 620e81f..8e8e0ff 100644
--- a/portfolio/org.eclipse.egf.eclipse.resources.mgt/build.properties
+++ b/portfolio/org.eclipse.egf.eclipse.resources.mgt/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.eclipse.resources.mgt/plugin.properties b/portfolio/org.eclipse.egf.eclipse.resources.mgt/plugin.properties
index bf249c4..5824a3a 100644
--- a/portfolio/org.eclipse.egf.eclipse.resources.mgt/plugin.properties
+++ b/portfolio/org.eclipse.egf.eclipse.resources.mgt/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.eclipse.resources.mgt/plugin.xml b/portfolio/org.eclipse.egf.eclipse.resources.mgt/plugin.xml
index 7629f66..1fa4822 100644
--- a/portfolio/org.eclipse.egf.eclipse.resources.mgt/plugin.xml
+++ b/portfolio/org.eclipse.egf.eclipse.resources.mgt/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/Activator.java b/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/Activator.java
index aa9822d..26dfe52 100644
--- a/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/Activator.java
+++ b/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/Activator.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/CopyFilesTask.java b/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/CopyFilesTask.java
index 4c75d2e..6ae1990 100644
--- a/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/CopyFilesTask.java
+++ b/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/CopyFilesTask.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2016 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/CreateFeatureTask.java b/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/CreateFeatureTask.java
index ce75929..460ddd5 100644
--- a/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/CreateFeatureTask.java
+++ b/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/CreateFeatureTask.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2014 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/CreateProjectTask.java b/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/CreateProjectTask.java
index f65944d..45992bc 100644
--- a/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/CreateProjectTask.java
+++ b/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/CreateProjectTask.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/PluginManagementTask.java b/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/PluginManagementTask.java
index 72e9d11..dabff16 100644
--- a/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/PluginManagementTask.java
+++ b/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/PluginManagementTask.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2016 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/UpdateFeatureTask.java b/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/UpdateFeatureTask.java
index b9ca49b..2f79e21 100644
--- a/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/UpdateFeatureTask.java
+++ b/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/UpdateFeatureTask.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2014 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/operation/CreateFeatureOperation.java b/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/operation/CreateFeatureOperation.java
index 3792217..a967651 100644
--- a/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/operation/CreateFeatureOperation.java
+++ b/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/operation/CreateFeatureOperation.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2014 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/operation/UpdateFeatureOperation.java b/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/operation/UpdateFeatureOperation.java
index ac07949..765483a 100644
--- a/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/operation/UpdateFeatureOperation.java
+++ b/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/operation/UpdateFeatureOperation.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2014 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/util/EclipseModelsAccessor.java b/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/util/EclipseModelsAccessor.java
index d7095b3..0494128 100644
--- a/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/util/EclipseModelsAccessor.java
+++ b/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/util/EclipseModelsAccessor.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2014 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/util/IFeatureConstants.java b/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/util/IFeatureConstants.java
index a157516..4261e00 100644
--- a/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/util/IFeatureConstants.java
+++ b/portfolio/org.eclipse.egf.eclipse.resources.mgt/src/org/eclipse/egf/eclipse/resources/mgt/util/IFeatureConstants.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2014 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.docgen.html/build.properties b/portfolio/org.eclipse.egf.emf.docgen.html/build.properties
index 0e0d3a5..4e21415 100644
--- a/portfolio/org.eclipse.egf.emf.docgen.html/build.properties
+++ b/portfolio/org.eclipse.egf.emf.docgen.html/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.docgen.html/plugin.properties b/portfolio/org.eclipse.egf.emf.docgen.html/plugin.properties
index 2f8d584..b91c62e 100644
--- a/portfolio/org.eclipse.egf.emf.docgen.html/plugin.properties
+++ b/portfolio/org.eclipse.egf.emf.docgen.html/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.docgen.html/plugin.xml b/portfolio/org.eclipse.egf.emf.docgen.html/plugin.xml
index 850aede..91877db 100644
--- a/portfolio/org.eclipse.egf.emf.docgen.html/plugin.xml
+++ b/portfolio/org.eclipse.egf.emf.docgen.html/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.docgen.html/src/org/eclipse/egf/emf/docgen/html/EmfDocProductionContextFromGenModel.java b/portfolio/org.eclipse.egf.emf.docgen.html/src/org/eclipse/egf/emf/docgen/html/EmfDocProductionContextFromGenModel.java
index 41a650a..4592784 100644
--- a/portfolio/org.eclipse.egf.emf.docgen.html/src/org/eclipse/egf/emf/docgen/html/EmfDocProductionContextFromGenModel.java
+++ b/portfolio/org.eclipse.egf.emf.docgen.html/src/org/eclipse/egf/emf/docgen/html/EmfDocProductionContextFromGenModel.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.docgen.html/src/org/eclipse/egf/emf/docgen/html/reporter/PatternReporter.java b/portfolio/org.eclipse.egf.emf.docgen.html/src/org/eclipse/egf/emf/docgen/html/reporter/PatternReporter.java
index f40cc6a..a5bf995 100644
--- a/portfolio/org.eclipse.egf.emf.docgen.html/src/org/eclipse/egf/emf/docgen/html/reporter/PatternReporter.java
+++ b/portfolio/org.eclipse.egf.emf.docgen.html/src/org/eclipse/egf/emf/docgen/html/reporter/PatternReporter.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.emf.docgen.html/src/org/eclipse/egf/emf/docgen/html/util/EmfHtmlDocGen.java b/portfolio/org.eclipse.egf.emf.docgen.html/src/org/eclipse/egf/emf/docgen/html/util/EmfHtmlDocGen.java
index a209b37..c0fa1b3 100644
--- a/portfolio/org.eclipse.egf.emf.docgen.html/src/org/eclipse/egf/emf/docgen/html/util/EmfHtmlDocGen.java
+++ b/portfolio/org.eclipse.egf.emf.docgen.html/src/org/eclipse/egf/emf/docgen/html/util/EmfHtmlDocGen.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.docgen.html/src/org/eclipse/egf/emf/docgen/html/util/EmfHtmlDocGenConstants.java b/portfolio/org.eclipse.egf.emf.docgen.html/src/org/eclipse/egf/emf/docgen/html/util/EmfHtmlDocGenConstants.java
index 193e305..6c63b1f 100644
--- a/portfolio/org.eclipse.egf.emf.docgen.html/src/org/eclipse/egf/emf/docgen/html/util/EmfHtmlDocGenConstants.java
+++ b/portfolio/org.eclipse.egf.emf.docgen.html/src/org/eclipse/egf/emf/docgen/html/util/EmfHtmlDocGenConstants.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.docgen.html/src/org/eclipse/egf/emf/docgen/html/util/FcoreUtil.java b/portfolio/org.eclipse.egf.emf.docgen.html/src/org/eclipse/egf/emf/docgen/html/util/FcoreUtil.java
index 56c00e5..c71f92d 100644
--- a/portfolio/org.eclipse.egf.emf.docgen.html/src/org/eclipse/egf/emf/docgen/html/util/FcoreUtil.java
+++ b/portfolio/org.eclipse.egf.emf.docgen.html/src/org/eclipse/egf/emf/docgen/html/util/FcoreUtil.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.pattern.base/build.properties b/portfolio/org.eclipse.egf.emf.pattern.base/build.properties
index 6e29b73..11ed0db 100644
--- a/portfolio/org.eclipse.egf.emf.pattern.base/build.properties
+++ b/portfolio/org.eclipse.egf.emf.pattern.base/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.pattern.base/plugin.properties b/portfolio/org.eclipse.egf.emf.pattern.base/plugin.properties
index d36d91e..130808f 100644
--- a/portfolio/org.eclipse.egf.emf.pattern.base/plugin.properties
+++ b/portfolio/org.eclipse.egf.emf.pattern.base/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.pattern.base/plugin.xml b/portfolio/org.eclipse.egf.emf.pattern.base/plugin.xml
index 43cdec3..1c5978d 100644
--- a/portfolio/org.eclipse.egf.emf.pattern.base/plugin.xml
+++ b/portfolio/org.eclipse.egf.emf.pattern.base/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/CodegenGeneratorAdapter.java b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/CodegenGeneratorAdapter.java
index 3a99da0..b643cd7 100644
--- a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/CodegenGeneratorAdapter.java
+++ b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/CodegenGeneratorAdapter.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009, 2018 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/CodegenPatternExecutionReporter.java b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/CodegenPatternExecutionReporter.java
index 9c2c522..12f041e 100644
--- a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/CodegenPatternExecutionReporter.java
+++ b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/CodegenPatternExecutionReporter.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/ContentType.java b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/ContentType.java
index d88ac96..85889b8 100644
--- a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/ContentType.java
+++ b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/ContentType.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/ContentTypePatternExecutionReporter.java b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/ContentTypePatternExecutionReporter.java
index d78ee78..b6e2096 100644
--- a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/ContentTypePatternExecutionReporter.java
+++ b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/ContentTypePatternExecutionReporter.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/EGFGenModelUtil.java b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/EGFGenModelUtil.java
index ed05995..6f0aced 100644
--- a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/EGFGenModelUtil.java
+++ b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/EGFGenModelUtil.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009, 2018 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/EMFPatternHelper.java b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/EMFPatternHelper.java
index b1d9474..47daea9 100644
--- a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/EMFPatternHelper.java
+++ b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/EMFPatternHelper.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/GIFPatternExecutionReporter.java b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/GIFPatternExecutionReporter.java
index 94a2d91..0ea591e 100644
--- a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/GIFPatternExecutionReporter.java
+++ b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/GIFPatternExecutionReporter.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/JavaPatternExecutionReporter.java b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/JavaPatternExecutionReporter.java
index 2634805..b34b08c 100644
--- a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/JavaPatternExecutionReporter.java
+++ b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/JavaPatternExecutionReporter.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/ModelDrivenStrategyTaskForGenModel.java b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/ModelDrivenStrategyTaskForGenModel.java
index c3e0f0d..4cc1fba 100644
--- a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/ModelDrivenStrategyTaskForGenModel.java
+++ b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/ModelDrivenStrategyTaskForGenModel.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/PropertiesPatternExecutionReporter.java b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/PropertiesPatternExecutionReporter.java
index 6e8e7b4..c225dc0 100644
--- a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/PropertiesPatternExecutionReporter.java
+++ b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/PropertiesPatternExecutionReporter.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/StringJETEmitter.java b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/StringJETEmitter.java
index 827fd85..880e79e 100644
--- a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/StringJETEmitter.java
+++ b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/StringJETEmitter.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/TextPatternExecutionReporter.java b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/TextPatternExecutionReporter.java
index 433e710..cdc00a8 100644
--- a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/TextPatternExecutionReporter.java
+++ b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/base/TextPatternExecutionReporter.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/util/FcoreUtil.java b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/util/FcoreUtil.java
index 2ab1c07..157b52b 100644
--- a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/util/FcoreUtil.java
+++ b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/util/FcoreUtil.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/util/PartType.java b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/util/PartType.java
index 544c423..2d40dd0 100644
--- a/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/util/PartType.java
+++ b/portfolio/org.eclipse.egf.emf.pattern.base/src/org/eclipse/egf/emf/pattern/util/PartType.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.pattern.cdo/plugin.properties b/portfolio/org.eclipse.egf.emf.pattern.cdo/plugin.properties
index 32fc405..cc8ba0b 100644
--- a/portfolio/org.eclipse.egf.emf.pattern.cdo/plugin.properties
+++ b/portfolio/org.eclipse.egf.emf.pattern.cdo/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.pattern.cdo/src/org/eclipse/emf/cdo/internal/messages/Messages.java b/portfolio/org.eclipse.egf.emf.pattern.cdo/src/org/eclipse/emf/cdo/internal/messages/Messages.java
index 3ea5b01..1a05197 100644
--- a/portfolio/org.eclipse.egf.emf.pattern.cdo/src/org/eclipse/emf/cdo/internal/messages/Messages.java
+++ b/portfolio/org.eclipse.egf.emf.pattern.cdo/src/org/eclipse/emf/cdo/internal/messages/Messages.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  *    Victor Roldan Betancort - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.emf.pattern.cdo/src/org/eclipse/emf/cdo/internal/messages/messages.properties b/portfolio/org.eclipse.egf.emf.pattern.cdo/src/org/eclipse/emf/cdo/internal/messages/messages.properties
index e219cbe..21080d8 100644
--- a/portfolio/org.eclipse.egf.emf.pattern.cdo/src/org/eclipse/emf/cdo/internal/messages/messages.properties
+++ b/portfolio/org.eclipse.egf.emf.pattern.cdo/src/org/eclipse/emf/cdo/internal/messages/messages.properties
@@ -1,12 +1,17 @@
-# Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+##
+#  Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
 #
+#  This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License 2.0
+#  which accompanies this distribution, and is available at
+#  https://www.eclipse.org/legal/epl-2.0
+#
+#  SPDX-License-Identifier: EPL-2.0
+# 
 # Contributors:
 #    Victor Roldan Betancort - initial API and implementation
 #    Eike Stepper - maintenance
+##
 
 CDOImporter_2=Specify a valid Ecore model and try loading again
 CDOImporter_4=Loading {0}
diff --git a/portfolio/org.eclipse.egf.emf.pattern.cdo/src/org/eclipse/emf/cdo/internal/migrator/CDOMigratorUtil.java b/portfolio/org.eclipse.egf.emf.pattern.cdo/src/org/eclipse/emf/cdo/internal/migrator/CDOMigratorUtil.java
index 703ee8b..acc883b 100644
--- a/portfolio/org.eclipse.egf.emf.pattern.cdo/src/org/eclipse/emf/cdo/internal/migrator/CDOMigratorUtil.java
+++ b/portfolio/org.eclipse.egf.emf.pattern.cdo/src/org/eclipse/emf/cdo/internal/migrator/CDOMigratorUtil.java
@@ -1,10 +1,12 @@
 package org.eclipse.emf.cdo.internal.migrator;
 /**
  * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  *
  * Contributors:
  *    Eike Stepper - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.emf.pattern.ui/build.properties b/portfolio/org.eclipse.egf.emf.pattern.ui/build.properties
index 250c389..eb580a4 100644
--- a/portfolio/org.eclipse.egf.emf.pattern.ui/build.properties
+++ b/portfolio/org.eclipse.egf.emf.pattern.ui/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.pattern.ui/plugin.properties b/portfolio/org.eclipse.egf.emf.pattern.ui/plugin.properties
index 74f502d..45a8e06 100644
--- a/portfolio/org.eclipse.egf.emf.pattern.ui/plugin.properties
+++ b/portfolio/org.eclipse.egf.emf.pattern.ui/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.pattern.ui/plugin.xml b/portfolio/org.eclipse.egf.emf.pattern.ui/plugin.xml
index 32cc746..967cf08 100644
--- a/portfolio/org.eclipse.egf.emf.pattern.ui/plugin.xml
+++ b/portfolio/org.eclipse.egf.emf.pattern.ui/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.pattern.ui/src/org/eclipse/egf/emf/pattern/ui/Activator.java b/portfolio/org.eclipse.egf.emf.pattern.ui/src/org/eclipse/egf/emf/pattern/ui/Activator.java
index e085267..d27c6aa 100644
--- a/portfolio/org.eclipse.egf.emf.pattern.ui/src/org/eclipse/egf/emf/pattern/ui/Activator.java
+++ b/portfolio/org.eclipse.egf.emf.pattern.ui/src/org/eclipse/egf/emf/pattern/ui/Activator.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.pattern.ui/src/org/eclipse/egf/emf/pattern/ui/CreateFcoreAction.java b/portfolio/org.eclipse.egf.emf.pattern.ui/src/org/eclipse/egf/emf/pattern/ui/CreateFcoreAction.java
index c494ab9..210019f 100644
--- a/portfolio/org.eclipse.egf.emf.pattern.ui/src/org/eclipse/egf/emf/pattern/ui/CreateFcoreAction.java
+++ b/portfolio/org.eclipse.egf.emf.pattern.ui/src/org/eclipse/egf/emf/pattern/ui/CreateFcoreAction.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.pattern.ui/src/org/eclipse/egf/emf/pattern/ui/messages.properties b/portfolio/org.eclipse.egf.emf.pattern.ui/src/org/eclipse/egf/emf/pattern/ui/messages.properties
index 3d175e5..4e13feb 100644
--- a/portfolio/org.eclipse.egf.emf.pattern.ui/src/org/eclipse/egf/emf/pattern/ui/messages.properties
+++ b/portfolio/org.eclipse.egf.emf.pattern.ui/src/org/eclipse/egf/emf/pattern/ui/messages.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.wrapper.ui/build.properties b/portfolio/org.eclipse.egf.emf.wrapper.ui/build.properties
index 146a439..221fe39 100644
--- a/portfolio/org.eclipse.egf.emf.wrapper.ui/build.properties
+++ b/portfolio/org.eclipse.egf.emf.wrapper.ui/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.wrapper.ui/plugin.properties b/portfolio/org.eclipse.egf.emf.wrapper.ui/plugin.properties
index 970d874..d8f99bf 100644
--- a/portfolio/org.eclipse.egf.emf.wrapper.ui/plugin.properties
+++ b/portfolio/org.eclipse.egf.emf.wrapper.ui/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.wrapper.ui/src/org/eclipse/egf/emf/wrapper/l10n/EMFWrapperMessages.java b/portfolio/org.eclipse.egf.emf.wrapper.ui/src/org/eclipse/egf/emf/wrapper/l10n/EMFWrapperMessages.java
index 472a990..b5db477 100644
--- a/portfolio/org.eclipse.egf.emf.wrapper.ui/src/org/eclipse/egf/emf/wrapper/l10n/EMFWrapperMessages.java
+++ b/portfolio/org.eclipse.egf.emf.wrapper.ui/src/org/eclipse/egf/emf/wrapper/l10n/EMFWrapperMessages.java
@@ -1,10 +1,12 @@
 /**

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.wrapper.ui/src/org/eclipse/egf/emf/wrapper/l10n/messages.properties b/portfolio/org.eclipse.egf.emf.wrapper.ui/src/org/eclipse/egf/emf/wrapper/l10n/messages.properties
index beab72c..e33a36b 100644
--- a/portfolio/org.eclipse.egf.emf.wrapper.ui/src/org/eclipse/egf/emf/wrapper/l10n/messages.properties
+++ b/portfolio/org.eclipse.egf.emf.wrapper.ui/src/org/eclipse/egf/emf/wrapper/l10n/messages.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.wrapper.ui/src/org/eclipse/egf/emf/wrapper/ui/Activator.java b/portfolio/org.eclipse.egf.emf.wrapper.ui/src/org/eclipse/egf/emf/wrapper/ui/Activator.java
index 6246b04..1a9d142 100644
--- a/portfolio/org.eclipse.egf.emf.wrapper.ui/src/org/eclipse/egf/emf/wrapper/ui/Activator.java
+++ b/portfolio/org.eclipse.egf.emf.wrapper.ui/src/org/eclipse/egf/emf/wrapper/ui/Activator.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.wrapper.ui/src/org/eclipse/egf/emf/wrapper/ui/CreateFcoreAction.java b/portfolio/org.eclipse.egf.emf.wrapper.ui/src/org/eclipse/egf/emf/wrapper/ui/CreateFcoreAction.java
index 2272cbe..904b458 100644
--- a/portfolio/org.eclipse.egf.emf.wrapper.ui/src/org/eclipse/egf/emf/wrapper/ui/CreateFcoreAction.java
+++ b/portfolio/org.eclipse.egf.emf.wrapper.ui/src/org/eclipse/egf/emf/wrapper/ui/CreateFcoreAction.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.wrapper/build.properties b/portfolio/org.eclipse.egf.emf.wrapper/build.properties
index 2bdc0d4..bc8e2f9 100644
--- a/portfolio/org.eclipse.egf.emf.wrapper/build.properties
+++ b/portfolio/org.eclipse.egf.emf.wrapper/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.wrapper/plugin.properties b/portfolio/org.eclipse.egf.emf.wrapper/plugin.properties
index 4e31865..987b30c 100644
--- a/portfolio/org.eclipse.egf.emf.wrapper/plugin.properties
+++ b/portfolio/org.eclipse.egf.emf.wrapper/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/Activator.java b/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/Activator.java
index 7fa6fba..96fad09 100644
--- a/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/Activator.java
+++ b/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/Activator.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/CreateFcoreUtil.java b/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/CreateFcoreUtil.java
index 0356d20..16a45b1 100644
--- a/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/CreateFcoreUtil.java
+++ b/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/CreateFcoreUtil.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/EgfEmfAbstractTask.java b/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/EgfEmfAbstractTask.java
index 1611c40..8d5bc4b 100644
--- a/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/EgfEmfAbstractTask.java
+++ b/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/EgfEmfAbstractTask.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/EgfEmfAllTask.java b/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/EgfEmfAllTask.java
index 600beb3..5c8c658 100644
--- a/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/EgfEmfAllTask.java
+++ b/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/EgfEmfAllTask.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/EgfEmfEditTask.java b/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/EgfEmfEditTask.java
index 427d441..2d2acf3 100644
--- a/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/EgfEmfEditTask.java
+++ b/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/EgfEmfEditTask.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/EgfEmfEditorTask.java b/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/EgfEmfEditorTask.java
index 95d7e27..33bf12a 100644
--- a/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/EgfEmfEditorTask.java
+++ b/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/EgfEmfEditorTask.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/EgfEmfModelTask.java b/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/EgfEmfModelTask.java
index 6bcf601..39d2675 100644
--- a/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/EgfEmfModelTask.java
+++ b/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/EgfEmfModelTask.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/EgfEmfTestTask.java b/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/EgfEmfTestTask.java
index 01fed69..d793b01 100644
--- a/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/EgfEmfTestTask.java
+++ b/portfolio/org.eclipse.egf.emf.wrapper/src/org/eclipse/egf/emf/wrapper/EgfEmfTestTask.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.ant.javadoc/build.properties b/portfolio/org.eclipse.egf.portfolio.ant.javadoc/build.properties
index 500b7e9..d9ba91d 100644
--- a/portfolio/org.eclipse.egf.portfolio.ant.javadoc/build.properties
+++ b/portfolio/org.eclipse.egf.portfolio.ant.javadoc/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.ant.javadoc/plugin.properties b/portfolio/org.eclipse.egf.portfolio.ant.javadoc/plugin.properties
index d7243cf..29ec992 100644
--- a/portfolio/org.eclipse.egf.portfolio.ant.javadoc/plugin.properties
+++ b/portfolio/org.eclipse.egf.portfolio.ant.javadoc/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.ant.javadoc/src/org/eclipse/egf/portfolio/ant/javadoc/GenModelToJavadoc.java b/portfolio/org.eclipse.egf.portfolio.ant.javadoc/src/org/eclipse/egf/portfolio/ant/javadoc/GenModelToJavadoc.java
index 43054b7..d8db281 100644
--- a/portfolio/org.eclipse.egf.portfolio.ant.javadoc/src/org/eclipse/egf/portfolio/ant/javadoc/GenModelToJavadoc.java
+++ b/portfolio/org.eclipse.egf.portfolio.ant.javadoc/src/org/eclipse/egf/portfolio/ant/javadoc/GenModelToJavadoc.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.ant.javadoc/src/org/eclipse/egf/portfolio/ant/javadoc/OutputReporter.java b/portfolio/org.eclipse.egf.portfolio.ant.javadoc/src/org/eclipse/egf/portfolio/ant/javadoc/OutputReporter.java
index 1fb929e..ec46ee6 100644
--- a/portfolio/org.eclipse.egf.portfolio.ant.javadoc/src/org/eclipse/egf/portfolio/ant/javadoc/OutputReporter.java
+++ b/portfolio/org.eclipse.egf.portfolio.ant.javadoc/src/org/eclipse/egf/portfolio/ant/javadoc/OutputReporter.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.egf/build.properties b/portfolio/org.eclipse.egf.portfolio.eclipse.build.egf/build.properties
index d087850..92abc7a 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.egf/build.properties
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.egf/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009, 2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.egf/plugin.properties b/portfolio/org.eclipse.egf.portfolio.eclipse.build.egf/plugin.properties
index af1afd9..bb92c27 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.egf/plugin.properties
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.egf/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/build.properties b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/build.properties
index 30aea5a..2e9bc1b 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/build.properties
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/build.properties
@@ -1,13 +1,16 @@
-#    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#    All rights reserved. This program and the accompanying materials

-#    are made available under the terms of the Eclipse Public License v1.0

-#    which accompanies this distribution, and is available at

-#    http://www.eclipse.org/legal/epl-v10.html

-#   

-#    Contributors:

-#        Thales Corporate Services S.A.S - initial API and implementation

+##

+#  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

 #

-# $Id$

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

+# 

+#  Contributors:

+#        Thales Corporate Services S.A.S - initial API and implementation

+##

 

 

 bin.includes = .,\

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/plugin.properties b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/plugin.properties
index 14c9340..8360673 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/plugin.properties
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/plugin.properties
Binary files differ
diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/plugin.xml b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/plugin.xml
index affaca9..94f3bdd 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/plugin.xml
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/plugin.xml
@@ -3,10 +3,12 @@
 

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/presentation/BuildCoreEditorPlugin.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/presentation/BuildCoreEditorPlugin.java
index b3778bc..a1abec9 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/presentation/BuildCoreEditorPlugin.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/presentation/BuildCoreEditorPlugin.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -31,7 +33,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

     

     /**

      * Keep track of the singleton.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/presentation/BuildcoreActionBarContributor.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/presentation/BuildcoreActionBarContributor.java
index 8ae0d67..8036a50 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/presentation/BuildcoreActionBarContributor.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/presentation/BuildcoreActionBarContributor.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -65,7 +67,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This keeps track of the active editor.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/presentation/BuildcoreEditor.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/presentation/BuildcoreEditor.java
index b846d09..c362f3a 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/presentation/BuildcoreEditor.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/presentation/BuildcoreEditor.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -224,7 +226,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This keeps track of the editing domain that is used to track all changes to the model.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/presentation/BuildcoreModelWizard.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/presentation/BuildcoreModelWizard.java
index 3465f20..93dd225 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/presentation/BuildcoreModelWizard.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/presentation/BuildcoreModelWizard.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -126,7 +128,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * The supported extensions for created files.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/AbstractStepContainerItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/AbstractStepContainerItemProvider.java
index 021dafb..456eeb3 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/AbstractStepContainerItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/AbstractStepContainerItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  */

@@ -54,7 +56,7 @@
 	 * <!-- end-user-doc -->

      * @generated

      */

-	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 	/**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/BuildCoreEditPlugin.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/BuildCoreEditPlugin.java
index 7458078..9ea6067 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/BuildCoreEditPlugin.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/BuildCoreEditPlugin.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -31,7 +33,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

     

     /**

      * Keep track of the singleton.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/BuildcoreItemProviderAdapterFactory.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/BuildcoreItemProviderAdapterFactory.java
index 8caaad4..b73e500 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/BuildcoreItemProviderAdapterFactory.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/BuildcoreItemProviderAdapterFactory.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -58,7 +60,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This keeps track of the root adapter factory that delegates to this adapter factory.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/ChainItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/ChainItemProvider.java
index da2063d..1806ac7 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/ChainItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/ChainItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -55,7 +57,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/DeploymentItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/DeploymentItemProvider.java
index 6001b49..6ddb6fa 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/DeploymentItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/DeploymentItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -50,7 +52,7 @@
 	 * <!-- end-user-doc -->

      * @generated

      */

-	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 	/**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/ItemItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/ItemItemProvider.java
index 2786bed..16526ba 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/ItemItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/ItemItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -59,7 +61,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/ItemPropertiesItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/ItemPropertiesItemProvider.java
index 4165ba1..4bf2918 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/ItemPropertiesItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/ItemPropertiesItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -53,7 +55,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/JobItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/JobItemProvider.java
index a600ea3..316ba1f 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/JobItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/JobItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -55,7 +57,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/KeyValueItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/KeyValueItemProvider.java
index e50461b..795088a 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/KeyValueItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/KeyValueItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -56,7 +58,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/PropertyItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/PropertyItemProvider.java
index 5d6345e..2f368f0 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/PropertyItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/PropertyItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -56,7 +58,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/PropertyPackageItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/PropertyPackageItemProvider.java
index 90f8e1d..5b96491 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/PropertyPackageItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/PropertyPackageItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -59,7 +61,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/ReuseStepItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/ReuseStepItemProvider.java
index 1703487..b63d0d6 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/ReuseStepItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/ReuseStepItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -50,7 +52,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/SCMItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/SCMItemProvider.java
index 4162ec4..33f5a20 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/SCMItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/SCMItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -50,7 +52,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/StepContainerItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/StepContainerItemProvider.java
index 630fadc..b1b52d3 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/StepContainerItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/StepContainerItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  */

@@ -50,7 +52,7 @@
 	 * <!-- end-user-doc -->

      * @generated

      */

-	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 	/**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/StepItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/StepItemProvider.java
index af2b14b..31040e6 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/StepItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/StepItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -55,7 +57,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/TriggerItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/TriggerItemProvider.java
index 98fdf4d..5595324 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/TriggerItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/provider/TriggerItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -50,7 +52,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/BuildDeployEditPlugin.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/BuildDeployEditPlugin.java
index 452ba3d..823aec6 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/BuildDeployEditPlugin.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/BuildDeployEditPlugin.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -32,7 +34,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 	/**

 	 * Keep track of the singleton.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/BuilddeployItemProviderAdapterFactory.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/BuilddeployItemProviderAdapterFactory.java
index 4c32282..cda5774 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/BuilddeployItemProviderAdapterFactory.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/BuilddeployItemProviderAdapterFactory.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -64,7 +66,7 @@
 	 * <!-- end-user-doc -->

      * @generated

      */

-	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 	/**

      * This keeps track of the root adapter factory that delegates to this adapter factory.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/CronTriggerItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/CronTriggerItemProvider.java
index 9fe4b06..65596f0 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/CronTriggerItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/CronTriggerItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -52,7 +54,7 @@
 	 * <!-- end-user-doc -->

      * @generated

      */

-	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 	/**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/DeploymentTargetItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/DeploymentTargetItemProvider.java
index 1834742..488bd0f 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/DeploymentTargetItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/DeploymentTargetItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -50,7 +52,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 	/**

 	 * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/GenerationLocationItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/GenerationLocationItemProvider.java
index db8495b..441b613 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/GenerationLocationItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/GenerationLocationItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -55,7 +57,7 @@
 	 * <!-- end-user-doc -->

      * @generated

      */

-	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 	/**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/HudsonDeploymentItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/HudsonDeploymentItemProvider.java
index fb76dc4..1d93af4 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/HudsonDeploymentItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/HudsonDeploymentItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -57,7 +59,7 @@
 	 * <!-- end-user-doc -->

      * @generated

      */

-	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 	/**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/SCMTriggerItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/SCMTriggerItemProvider.java
index 94c6a3c..075d739 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/SCMTriggerItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/SCMTriggerItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -52,7 +54,7 @@
 	 * <!-- end-user-doc -->

      * @generated

      */

-	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 	/**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/TriggerItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/TriggerItemProvider.java
index afd32e5..5f5d8be 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/TriggerItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/TriggerItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -50,7 +52,7 @@
 	 * <!-- end-user-doc -->

      * @generated

      */

-	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 	/**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/UserItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/UserItemProvider.java
index 75543c5..96a616e 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/UserItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/provider/UserItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -56,7 +58,7 @@
 	 * <!-- end-user-doc -->

      * @generated

      */

-	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 	/**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/AntParameterItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/AntParameterItemProvider.java
index 324c9c6..612d4b4 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/AntParameterItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/AntParameterItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -50,7 +52,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/BuildFileEditPlugin.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/BuildFileEditPlugin.java
index 461a38c..9ef9367 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/BuildFileEditPlugin.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/BuildFileEditPlugin.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -33,7 +35,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * Keep track of the singleton.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/BuildfileItemProviderAdapterFactory.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/BuildfileItemProviderAdapterFactory.java
index 5d07925..99c2529 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/BuildfileItemProviderAdapterFactory.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/BuildfileItemProviderAdapterFactory.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -68,7 +70,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This keeps track of the root adapter factory that delegates to this adapter factory.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/CopyStepItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/CopyStepItemProvider.java
index 482ec5d..b060800 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/CopyStepItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/CopyStepItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -52,7 +54,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/CreateFolderStepItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/CreateFolderStepItemProvider.java
index 15ed9e7..91f17b5 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/CreateFolderStepItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/CreateFolderStepItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -52,7 +54,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/DeleteStepItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/DeleteStepItemProvider.java
index 13f3503..e2013bc 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/DeleteStepItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/DeleteStepItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -52,7 +54,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/DownloadStepItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/DownloadStepItemProvider.java
index 10434cc..330747f 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/DownloadStepItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/DownloadStepItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -52,7 +54,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/FileStepItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/FileStepItemProvider.java
index b6068d5..c647cdf 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/FileStepItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/FileStepItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -57,7 +59,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/FilesetProviderItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/FilesetProviderItemProvider.java
index b5da2d5..53cb61a 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/FilesetProviderItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/FilesetProviderItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -56,7 +58,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/MoveStepItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/MoveStepItemProvider.java
index adcec4b..0ad7c98 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/MoveStepItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/MoveStepItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -52,7 +54,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/RenameStepItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/RenameStepItemProvider.java
index db58571..cf6df69 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/RenameStepItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/RenameStepItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -52,7 +54,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/TarStepItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/TarStepItemProvider.java
index 6b1b58b..3e703e1 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/TarStepItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/TarStepItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -52,7 +54,7 @@
 	 * <!-- end-user-doc -->

      * @generated

      */

-	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 	/**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/UnzipStepItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/UnzipStepItemProvider.java
index 0af80d6..c3b10ce 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/UnzipStepItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/UnzipStepItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -52,7 +54,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/ZipStepItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/ZipStepItemProvider.java
index 95ea952..df32183 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/ZipStepItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/provider/ZipStepItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -52,7 +54,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/BuildSCMEditPlugin.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/BuildSCMEditPlugin.java
index f7a8315..7dea226 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/BuildSCMEditPlugin.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/BuildSCMEditPlugin.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -33,7 +35,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

 	 * Keep track of the singleton.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/BuildscmItemProviderAdapterFactory.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/BuildscmItemProviderAdapterFactory.java
index 2fcfc6a..70f903e 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/BuildscmItemProviderAdapterFactory.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/BuildscmItemProviderAdapterFactory.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -65,7 +67,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

 	 * This keeps track of the root adapter factory that delegates to this adapter factory.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/GITBuildLocationItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/GITBuildLocationItemProvider.java
index 55a0819..373a85f 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/GITBuildLocationItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/GITBuildLocationItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -54,7 +56,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

 	 * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/GITGenerationLocationItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/GITGenerationLocationItemProvider.java
index c615971..fbdf1fa 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/GITGenerationLocationItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/GITGenerationLocationItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -52,7 +54,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

 	 * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/GITItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/GITItemProvider.java
index 4e5b199..11039f5 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/GITItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/GITItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -55,7 +57,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

 	 * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/GITLocationItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/GITLocationItemProvider.java
index 6df78bd..8c8e7a3 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/GITLocationItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/GITLocationItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -56,7 +58,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

 	 * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/SVNBuildLocationItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/SVNBuildLocationItemProvider.java
index c3fa8c0..8458ba5 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/SVNBuildLocationItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/SVNBuildLocationItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -54,7 +56,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

 	 * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/SVNGenerationLocationItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/SVNGenerationLocationItemProvider.java
index 9a8a65b..c57d3fa 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/SVNGenerationLocationItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/SVNGenerationLocationItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -49,7 +51,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 	/**

 	 * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/SVNItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/SVNItemProvider.java
index 6025787..8fcd94a 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/SVNItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/SVNItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -57,7 +59,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

 	 * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/SVNLocationItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/SVNLocationItemProvider.java
index eed1779..2504995 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/SVNLocationItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/provider/SVNLocationItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -56,7 +58,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

 	 * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/AbstractBuildLocationContainerItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/AbstractBuildLocationContainerItemProvider.java
index 0c22c98..bdc93bc 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/AbstractBuildLocationContainerItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/AbstractBuildLocationContainerItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -56,7 +58,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/AbstractBuildLocationItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/AbstractBuildLocationItemProvider.java
index e618f8b..c4bd332 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/AbstractBuildLocationItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/AbstractBuildLocationItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -50,7 +52,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/AggregateStepItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/AggregateStepItemProvider.java
index 7aa0785..31afb98 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/AggregateStepItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/AggregateStepItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -52,7 +54,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/AntStepItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/AntStepItemProvider.java
index 542b28f..5cde73b 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/AntStepItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/AntStepItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -56,7 +58,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/BinaryBuildLocationItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/BinaryBuildLocationItemProvider.java
index 0a5fe78..4919c6d 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/BinaryBuildLocationItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/BinaryBuildLocationItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -52,7 +54,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/BuildLocationContainerItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/BuildLocationContainerItemProvider.java
index 00407a5..910debb 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/BuildLocationContainerItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/BuildLocationContainerItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -55,7 +57,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/BuildStepEditPlugin.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/BuildStepEditPlugin.java
index e7af72a..c4995d1 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/BuildStepEditPlugin.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/BuildStepEditPlugin.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -31,7 +33,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * Keep track of the singleton.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/BuildStepItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/BuildStepItemProvider.java
index 7bf369c..57d4a2d 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/BuildStepItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/BuildStepItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -60,7 +62,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/BuildstepItemProviderAdapterFactory.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/BuildstepItemProviderAdapterFactory.java
index 028a78a..13ffb85 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/BuildstepItemProviderAdapterFactory.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/BuildstepItemProviderAdapterFactory.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -69,7 +71,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This keeps track of the root adapter factory that delegates to this adapter factory.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/CleanStepItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/CleanStepItemProvider.java
index bd996b7..8979e00 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/CleanStepItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/CleanStepItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -57,7 +59,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/ComponentItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/ComponentItemProvider.java
index 015985f..92db71b 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/ComponentItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/ComponentItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -56,7 +58,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/EGFSystemPropertyItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/EGFSystemPropertyItemProvider.java
index 6cdd9c5..64e6e29 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/EGFSystemPropertyItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/EGFSystemPropertyItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -50,7 +52,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/EgfActivityItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/EgfActivityItemProvider.java
index 41b45b1..b9aee4f 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/EgfActivityItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/EgfActivityItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -48,7 +50,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 	/**

 	 * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/EgfStepItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/EgfStepItemProvider.java
index faf69f2..aced62a 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/EgfStepItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/EgfStepItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -62,7 +64,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/FeatureItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/FeatureItemProvider.java
index bd9533b..ba76a21 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/FeatureItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/FeatureItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -48,7 +50,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/InstallStepBuildLocationItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/InstallStepBuildLocationItemProvider.java
index 8cd15fc..5a51b1a 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/InstallStepBuildLocationItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/InstallStepBuildLocationItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -50,7 +52,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/InstallStepItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/InstallStepItemProvider.java
index 8140c39..94b6ffc 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/InstallStepItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/InstallStepItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -59,7 +61,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/JavadocStepItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/JavadocStepItemProvider.java
index 4d9a739..44008e5 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/JavadocStepItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/JavadocStepItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -56,7 +58,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/LocalBuildLocationItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/LocalBuildLocationItemProvider.java
index 47ab63e..cb176e3 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/LocalBuildLocationItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/LocalBuildLocationItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -52,7 +54,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/PatternBuildLocationItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/PatternBuildLocationItemProvider.java
index c1ae474..d39907d 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/PatternBuildLocationItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/PatternBuildLocationItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -52,7 +54,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/PluginItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/PluginItemProvider.java
index 60c47bc..8e9b95e 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/PluginItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/PluginItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -48,7 +50,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/PublishStepItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/PublishStepItemProvider.java
index 09a107a..c955bce 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/PublishStepItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/PublishStepItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -52,7 +54,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/ResultStepBuildLocationItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/ResultStepBuildLocationItemProvider.java
index 844287a..8329136 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/ResultStepBuildLocationItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/ResultStepBuildLocationItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -50,7 +52,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/ResultStepItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/ResultStepItemProvider.java
index 5b49ff4..060ec67 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/ResultStepItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/ResultStepItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -51,7 +53,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/RunningPlatformBuildLocationItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/RunningPlatformBuildLocationItemProvider.java
index 21783c7..fcaea2e 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/RunningPlatformBuildLocationItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/RunningPlatformBuildLocationItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -48,7 +50,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/SourceBuildLocationItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/SourceBuildLocationItemProvider.java
index a8433df..b975e09 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/SourceBuildLocationItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/SourceBuildLocationItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -52,7 +54,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/TargetPlatformBuildLocationItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/TargetPlatformBuildLocationItemProvider.java
index c646d23..fd5db3e 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/TargetPlatformBuildLocationItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/TargetPlatformBuildLocationItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -52,7 +54,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/TestStepItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/TestStepItemProvider.java
index 0a031ae..546599d 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/TestStepItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/TestStepItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -56,7 +58,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/UpdateSiteBuildLocationItemProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/UpdateSiteBuildLocationItemProvider.java
index d2495a2..02c3c65 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/UpdateSiteBuildLocationItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/provider/UpdateSiteBuildLocationItemProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -52,7 +54,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * This constructs an instance from a factory and a notifier.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/BuildcoreAdapterFactoryContentProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/BuildcoreAdapterFactoryContentProvider.java
index 1e8aa2e..95073ab 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/BuildcoreAdapterFactoryContentProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/BuildcoreAdapterFactoryContentProvider.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/deploy/DeployAction.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/deploy/DeployAction.java
index 438110c..1282964 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/deploy/DeployAction.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/deploy/DeployAction.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/deploy/PullAction.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/deploy/PullAction.java
index 97d0eb5..2c1ba03 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/deploy/PullAction.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/deploy/PullAction.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/deploy/PushAction.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/deploy/PushAction.java
index c70ccfc..ba4765f 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/deploy/PushAction.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/deploy/PushAction.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/item/DisableAction.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/item/DisableAction.java
index 17005c9..2dd1d03 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/item/DisableAction.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/item/DisableAction.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/item/EnableAction.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/item/EnableAction.java
index 80aee4e..429cf82 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/item/EnableAction.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/item/EnableAction.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/item/ItemAction.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/item/ItemAction.java
index e9c98a9..b66a3e1 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/item/ItemAction.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build.ui/src/org/eclipse/egf/portfolio/eclipse/build/ui/item/ItemAction.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/build.properties b/portfolio/org.eclipse.egf.portfolio.eclipse.build/build.properties
index a96432d..ef28024 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/build.properties
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009, 2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/plugin.properties b/portfolio/org.eclipse.egf.portfolio.eclipse.build/plugin.properties
index 0306863..4855c0c 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/plugin.properties
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/plugin.xml b/portfolio/org.eclipse.egf.portfolio.eclipse.build/plugin.xml
index 81f89e5..cb3b554 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/plugin.xml
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/plugin.xml
@@ -3,10 +3,12 @@
 

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/BuildWorkspace.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/BuildWorkspace.java
index 8f9ff1d..8a9544a 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/BuildWorkspace.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/BuildWorkspace.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/FileReporter.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/FileReporter.java
index e213bdb..ba67a67 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/FileReporter.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/FileReporter.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/GenerationHelper.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/GenerationHelper.java
index deb8547..0eb8531 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/GenerationHelper.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/GenerationHelper.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/ItemPropertiesQuery.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/ItemPropertiesQuery.java
index 4c3b4c8..5bfcc0d 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/ItemPropertiesQuery.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/ItemPropertiesQuery.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/ModelDrivenGenerationTask.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/ModelDrivenGenerationTask.java
index 225956f..89e42b4 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/ModelDrivenGenerationTask.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/ModelDrivenGenerationTask.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/PropertiesHelper.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/PropertiesHelper.java
index 8e6d062..8e6866e 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/PropertiesHelper.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/PropertiesHelper.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/PropertyWrapper.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/PropertyWrapper.java
index c07a6fa..54bfbff 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/PropertyWrapper.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/PropertyWrapper.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/ReplacePropertiesFileReporter.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/ReplacePropertiesFileReporter.java
index 47fd57f..7b9280d 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/ReplacePropertiesFileReporter.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/ReplacePropertiesFileReporter.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/AbstractStepContainer.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/AbstractStepContainer.java
index 48a80e2..f57796c 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/AbstractStepContainer.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/AbstractStepContainer.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -39,7 +41,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/BuildcoreFactory.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/BuildcoreFactory.java
index 15af086..7bc7d58 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/BuildcoreFactory.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/BuildcoreFactory.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -29,7 +31,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * The singleton instance of the factory.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/BuildcorePackage.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/BuildcorePackage.java
index f95a412..e53f52d 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/BuildcorePackage.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/BuildcorePackage.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -40,7 +42,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * The package name.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/Chain.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/Chain.java
index 8a25f35..807fbeb 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/Chain.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/Chain.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -37,7 +39,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/Deployment.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/Deployment.java
index 88efdca..aa2b28e 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/Deployment.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/Deployment.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -31,7 +33,7 @@
 	 * <!-- end-user-doc -->

      * @generated

      */

-	String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+	String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/Item.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/Item.java
index 0b88645..5083c93 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/Item.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/Item.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -41,7 +43,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/ItemProperties.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/ItemProperties.java
index 3929bc3..f2d7d09 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/ItemProperties.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/ItemProperties.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -38,7 +40,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/Job.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/Job.java
index 21d81ae..fcddc14 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/Job.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/Job.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -38,7 +40,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/KeyValue.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/KeyValue.java
index 8e1e6af..660940f 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/KeyValue.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/KeyValue.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -38,7 +40,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/Property.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/Property.java
index ec03a9a..4b81ec0 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/Property.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/Property.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -37,7 +39,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * Returns the value of the '<em><b>Type</b></em>' attribute.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/PropertyPackage.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/PropertyPackage.java
index 095b605..4d1c1a1 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/PropertyPackage.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/PropertyPackage.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -41,7 +43,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/PropertyType.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/PropertyType.java
index c694aca..408ca49 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/PropertyType.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/PropertyType.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -54,7 +56,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * The '<em><b>RUNTIME</b></em>' literal value.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/ReuseStep.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/ReuseStep.java
index 97feedc..9fd5a7e 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/ReuseStep.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/ReuseStep.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -36,7 +38,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/SCM.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/SCM.java
index a816395..cd213e6 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/SCM.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/SCM.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -31,7 +33,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/Step.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/Step.java
index 1e08434..f96f4b5 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/Step.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/Step.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -31,7 +33,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/StepContainer.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/StepContainer.java
index 2715212..fbe7c95 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/StepContainer.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/StepContainer.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -31,7 +33,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/AbstractStepContainerImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/AbstractStepContainerImpl.java
index 3d95090..462d349 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/AbstractStepContainerImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/AbstractStepContainerImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -50,7 +52,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/BuildcoreFactoryImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/BuildcoreFactoryImpl.java
index a931cf1..c9d53d3 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/BuildcoreFactoryImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/BuildcoreFactoryImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -36,7 +38,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * Creates the default factory implementation.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/BuildcorePackageImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/BuildcorePackageImpl.java
index e83dfa0..2a05daf 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/BuildcorePackageImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/BuildcorePackageImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -47,7 +49,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * <!-- begin-user-doc -->

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/ChainImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/ChainImpl.java
index 4f0f3b7..5e2dc6d 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/ChainImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/ChainImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -52,7 +54,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/DeploymentImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/DeploymentImpl.java
index 87f5b69..b1b62f2 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/DeploymentImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/DeploymentImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -35,7 +37,7 @@
 	 * <!-- end-user-doc -->

      * @generated

      */

-	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 	/**

      * <!-- begin-user-doc -->

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/ItemImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/ItemImpl.java
index 2271787..f1ec752 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/ItemImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/ItemImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -54,7 +56,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/ItemPropertiesImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/ItemPropertiesImpl.java
index 3cb66d7..2260be9 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/ItemPropertiesImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/ItemPropertiesImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -50,7 +52,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/JobImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/JobImpl.java
index f0b0c0c..39dbe72 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/JobImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/JobImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -43,7 +45,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/KeyValueImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/KeyValueImpl.java
index a52a878..40ee90d 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/KeyValueImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/KeyValueImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -43,7 +45,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/PropertyImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/PropertyImpl.java
index 08f0c04..716ef00 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/PropertyImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/PropertyImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -43,7 +45,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/PropertyPackageImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/PropertyPackageImpl.java
index 7556799..d185a9a 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/PropertyPackageImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/PropertyPackageImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -54,7 +56,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/ReuseStepImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/ReuseStepImpl.java
index 6781468..647aefd 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/ReuseStepImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/ReuseStepImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -43,7 +45,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/SCMImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/SCMImpl.java
index be74c18..93ca96e 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/SCMImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/SCMImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -35,7 +37,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * <!-- begin-user-doc -->

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/StepContainerImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/StepContainerImpl.java
index 0b686f1..e611722 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/StepContainerImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/StepContainerImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -45,7 +47,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/StepImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/StepImpl.java
index ac84224..3f2dc90 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/StepImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/impl/StepImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -43,7 +45,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/migration/BuildcoreResourceHandler.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/migration/BuildcoreResourceHandler.java
index 475274a..fa02cd1 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/migration/BuildcoreResourceHandler.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/migration/BuildcoreResourceHandler.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/migration/BuildcoreSAXXMIHandler.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/migration/BuildcoreSAXXMIHandler.java
index 0a8ce85..162be76 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/migration/BuildcoreSAXXMIHandler.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/migration/BuildcoreSAXXMIHandler.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/migration/BuildcoreXMLHelper.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/migration/BuildcoreXMLHelper.java
index f197e57..054c03c 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/migration/BuildcoreXMLHelper.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/migration/BuildcoreXMLHelper.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/migration/BuildcoreXMLLoad.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/migration/BuildcoreXMLLoad.java
index 3abe8ee..0f29103 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/migration/BuildcoreXMLLoad.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/migration/BuildcoreXMLLoad.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/util/BuildcoreAdapterFactory.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/util/BuildcoreAdapterFactory.java
index dbbe0ee..40edb34 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/util/BuildcoreAdapterFactory.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/util/BuildcoreAdapterFactory.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -36,7 +38,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * The cached model package.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/util/BuildcoreResourceFactoryImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/util/BuildcoreResourceFactoryImpl.java
index c38de60..1ee8498 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/util/BuildcoreResourceFactoryImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/util/BuildcoreResourceFactoryImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -35,7 +37,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * Creates an instance of the resource factory.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/util/BuildcoreResourceImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/util/BuildcoreResourceImpl.java
index 5656ce0..447a5a6 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/util/BuildcoreResourceImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/util/BuildcoreResourceImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -33,7 +35,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * Creates an instance of the resource.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/util/BuildcoreSwitch.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/util/BuildcoreSwitch.java
index e78dc7b..652fe4d 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/util/BuildcoreSwitch.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildcore/util/BuildcoreSwitch.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -39,7 +41,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * The cached model package

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/BuilddeployFactory.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/BuilddeployFactory.java
index 66b93fd..475b157 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/BuilddeployFactory.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/BuilddeployFactory.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -29,7 +31,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * The singleton instance of the factory.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/BuilddeployPackage.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/BuilddeployPackage.java
index 558b149..394d751 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/BuilddeployPackage.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/BuilddeployPackage.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -42,7 +44,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * The package name.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/CronTrigger.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/CronTrigger.java
index 38109b2..05234e8 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/CronTrigger.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/CronTrigger.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -36,7 +38,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/GenerationLocation.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/GenerationLocation.java
index 282b630..b16ced5 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/GenerationLocation.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/GenerationLocation.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -37,7 +39,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * Returns the value of the '<em><b>Folder Name</b></em>' attribute.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/HudsonDeployment.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/HudsonDeployment.java
index 5c9c901..31ba29b 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/HudsonDeployment.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/HudsonDeployment.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -48,7 +50,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/PermissionType.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/PermissionType.java
index 43c2d57..911f202 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/PermissionType.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/PermissionType.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -64,7 +66,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * The '<em><b>READ</b></em>' literal value.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/SCMTrigger.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/SCMTrigger.java
index 7525669..6941a26 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/SCMTrigger.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/SCMTrigger.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -36,7 +38,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/Trigger.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/Trigger.java
index affabcb..a751457 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/Trigger.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/Trigger.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -31,7 +33,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/User.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/User.java
index 772ae15..b972743 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/User.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/User.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -38,7 +40,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/BuilddeployFactoryImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/BuilddeployFactoryImpl.java
index a6f698a..e2a0f67 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/BuilddeployFactoryImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/BuilddeployFactoryImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -36,7 +38,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * Creates the default factory implementation.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/BuilddeployPackageImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/BuilddeployPackageImpl.java
index 09b5124..703b11a 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/BuilddeployPackageImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/BuilddeployPackageImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -45,7 +47,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * <!-- begin-user-doc -->

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/CronTriggerImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/CronTriggerImpl.java
index e063271..47057b1 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/CronTriggerImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/CronTriggerImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -41,7 +43,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/GenerationLocationImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/GenerationLocationImpl.java
index 3d5c2d4..3069863 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/GenerationLocationImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/GenerationLocationImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -41,7 +43,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * The default value of the '{@link #getFolderName() <em>Folder Name</em>}' attribute.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/HudsonDeploymentImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/HudsonDeploymentImpl.java
index 2fcba38..93d140e 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/HudsonDeploymentImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/HudsonDeploymentImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -64,7 +66,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/SCMTriggerImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/SCMTriggerImpl.java
index 56d724d..93b6a41 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/SCMTriggerImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/SCMTriggerImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -41,7 +43,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/TriggerImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/TriggerImpl.java
index b931f70..5f9fd7f 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/TriggerImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/TriggerImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -35,7 +37,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * <!-- begin-user-doc -->

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/UserImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/UserImpl.java
index 826e001..1c23580 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/UserImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/impl/UserImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -44,7 +46,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/util/BuilddeployAdapterFactory.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/util/BuilddeployAdapterFactory.java
index 839bdab..c44febd 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/util/BuilddeployAdapterFactory.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/util/BuilddeployAdapterFactory.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -38,7 +40,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * The cached model package.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/util/BuilddeployResourceFactoryImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/util/BuilddeployResourceFactoryImpl.java
index fd6c7f8..7e3c344 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/util/BuilddeployResourceFactoryImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/util/BuilddeployResourceFactoryImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -32,7 +34,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * Creates an instance of the resource factory.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/util/BuilddeployResourceImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/util/BuilddeployResourceImpl.java
index e683db2..bb6d8aa 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/util/BuilddeployResourceImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/util/BuilddeployResourceImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -30,7 +32,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * Creates an instance of the resource.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/util/BuilddeploySwitch.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/util/BuilddeploySwitch.java
index fa4397a..3727296 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/util/BuilddeploySwitch.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/builddeploy/util/BuilddeploySwitch.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -41,7 +43,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * The cached model package

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/AntParameter.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/AntParameter.java
index 217a8f8..24b8d90 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/AntParameter.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/AntParameter.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -31,7 +33,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/BuildfileFactory.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/BuildfileFactory.java
index 9ee7e16..2f44255 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/BuildfileFactory.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/BuildfileFactory.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -29,7 +31,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * The singleton instance of the factory.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/BuildfilePackage.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/BuildfilePackage.java
index 963ce46..4478b2c 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/BuildfilePackage.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/BuildfilePackage.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -42,7 +44,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * The package name.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/CompressionMethod.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/CompressionMethod.java
index b8ce1d3..7b19ed5 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/CompressionMethod.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/CompressionMethod.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  */

@@ -61,7 +63,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * The '<em><b>None</b></em>' literal value.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/CopyStep.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/CopyStep.java
index 4031f97..886cd11 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/CopyStep.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/CopyStep.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -36,7 +38,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/CreateFolderStep.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/CreateFolderStep.java
index 2daca1f..d90a76f 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/CreateFolderStep.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/CreateFolderStep.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -36,7 +38,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/DeleteStep.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/DeleteStep.java
index 3af3bb5..1aae475 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/DeleteStep.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/DeleteStep.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -30,7 +32,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/DownloadStep.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/DownloadStep.java
index db83f5a..e9baa4a 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/DownloadStep.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/DownloadStep.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -37,7 +39,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/FileStep.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/FileStep.java
index 733ee38..18c68d2 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/FileStep.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/FileStep.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -40,7 +42,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/FilesetProvider.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/FilesetProvider.java
index 71d01f4..f4c272c 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/FilesetProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/FilesetProvider.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -45,7 +47,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/MoveStep.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/MoveStep.java
index ae3425d..2efc44d 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/MoveStep.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/MoveStep.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -36,7 +38,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/RenameStep.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/RenameStep.java
index 24b6d2f..386e61b 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/RenameStep.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/RenameStep.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -37,7 +39,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/TarStep.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/TarStep.java
index dc37ca5..0e8d1d0 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/TarStep.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/TarStep.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  */

@@ -35,7 +37,7 @@
 	 * <!-- end-user-doc -->

      * @generated

      */

-	String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+	String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 	/**

      * Returns the value of the '<em><b>Destfile</b></em>' attribute.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/UnzipStep.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/UnzipStep.java
index da689b7..bf2f9ba 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/UnzipStep.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/UnzipStep.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -37,7 +39,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/ZipStep.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/ZipStep.java
index ff68192..5d83960 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/ZipStep.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/ZipStep.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -37,7 +39,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/AntParameterImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/AntParameterImpl.java
index c543202..99cad8f 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/AntParameterImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/AntParameterImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -35,7 +37,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * <!-- begin-user-doc -->

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/BuildfileFactoryImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/BuildfileFactoryImpl.java
index c757f38..47274ca 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/BuildfileFactoryImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/BuildfileFactoryImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -36,7 +38,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * Creates the default factory implementation.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/BuildfilePackageImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/BuildfilePackageImpl.java
index e08a356..5ddd5c8 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/BuildfilePackageImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/BuildfilePackageImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -53,7 +55,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * <!-- begin-user-doc -->

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/CopyStepImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/CopyStepImpl.java
index c6bd607..e056f9c 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/CopyStepImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/CopyStepImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -60,7 +62,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/CreateFolderStepImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/CreateFolderStepImpl.java
index 0ffb95a..0a9e55b 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/CreateFolderStepImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/CreateFolderStepImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -41,7 +43,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/DeleteStepImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/DeleteStepImpl.java
index 80d55ae..1fcc8c6 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/DeleteStepImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/DeleteStepImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -55,7 +57,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/DownloadStepImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/DownloadStepImpl.java
index a33d00a..4d8f0ea 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/DownloadStepImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/DownloadStepImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -42,7 +44,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/FileStepImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/FileStepImpl.java
index 35440d0..036b6b6 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/FileStepImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/FileStepImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -52,7 +54,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/FilesetProviderImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/FilesetProviderImpl.java
index 07cb539..df76f52 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/FilesetProviderImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/FilesetProviderImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -56,7 +58,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/MoveStepImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/MoveStepImpl.java
index de1ca28..263c52d 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/MoveStepImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/MoveStepImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -60,7 +62,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/RenameStepImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/RenameStepImpl.java
index d679cfb..1fec6e7 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/RenameStepImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/RenameStepImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -42,7 +44,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/TarStepImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/TarStepImpl.java
index a7f9826..9e8e4ec 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/TarStepImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/TarStepImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  */

@@ -56,7 +58,7 @@
 	 * <!-- end-user-doc -->

      * @generated

      */

-	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+	public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 	/**

      * The cached value of the '{@link #getFilePaths() <em>File Paths</em>}' attribute list.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/UnzipStepImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/UnzipStepImpl.java
index 7bcac4a..367bf1e 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/UnzipStepImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/UnzipStepImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -42,7 +44,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/ZipStepImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/ZipStepImpl.java
index bfe9c4f..cdcdd36 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/ZipStepImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/impl/ZipStepImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -61,7 +63,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/util/BuildfileAdapterFactory.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/util/BuildfileAdapterFactory.java
index a8aff4d..7b833d2 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/util/BuildfileAdapterFactory.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/util/BuildfileAdapterFactory.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -40,7 +42,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * The cached model package.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/util/BuildfileSwitch.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/util/BuildfileSwitch.java
index 67715eb..7d30925 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/util/BuildfileSwitch.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildfile/util/BuildfileSwitch.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -43,7 +45,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * The cached model package

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/BuildscmFactory.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/BuildscmFactory.java
index 2d263aa..70c16ed 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/BuildscmFactory.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/BuildscmFactory.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -29,7 +31,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

 	 * The singleton instance of the factory.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/BuildscmPackage.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/BuildscmPackage.java
index 5fce49d..365628f 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/BuildscmPackage.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/BuildscmPackage.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -44,7 +46,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

 	 * The package name.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/GIT.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/GIT.java
index e8d52fd..b0b4ec7 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/GIT.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/GIT.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -39,7 +41,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/GITBuildLocation.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/GITBuildLocation.java
index dd3e072..07ecd80 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/GITBuildLocation.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/GITBuildLocation.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -38,7 +40,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/GITGenerationLocation.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/GITGenerationLocation.java
index 274b3e3..5271b1c 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/GITGenerationLocation.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/GITGenerationLocation.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -37,7 +39,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/GITLocation.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/GITLocation.java
index 5c9e856..87d84cd 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/GITLocation.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/GITLocation.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -42,7 +44,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/GITProtocol.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/GITProtocol.java
index 8d29601..08ba10e 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/GITProtocol.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/GITProtocol.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -74,7 +76,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

 	 * The '<em><b>HTTP</b></em>' literal value.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/SVN.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/SVN.java
index 9f17b76..efa4414 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/SVN.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/SVN.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -39,7 +41,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/SVNBuildLocation.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/SVNBuildLocation.java
index 14e06d4..618429f 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/SVNBuildLocation.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/SVNBuildLocation.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -38,7 +40,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/SVNGenerationLocation.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/SVNGenerationLocation.java
index 9442114..6c33513 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/SVNGenerationLocation.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/SVNGenerationLocation.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -37,7 +39,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/SVNLocation.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/SVNLocation.java
index b46e472..a0c1c44 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/SVNLocation.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/SVNLocation.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -41,7 +43,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/SVNProtocol.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/SVNProtocol.java
index 9ef4b49..3817cbe 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/SVNProtocol.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/SVNProtocol.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -74,7 +76,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

 	 * The '<em><b>HTTP</b></em>' literal value.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/BuildscmFactoryImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/BuildscmFactoryImpl.java
index a0c1fbf..f27f740 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/BuildscmFactoryImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/BuildscmFactoryImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -36,7 +38,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

 	 * Creates the default factory implementation.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/BuildscmPackageImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/BuildscmPackageImpl.java
index 3691bf0..e00b8cc 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/BuildscmPackageImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/BuildscmPackageImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -45,7 +47,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

 	 * <!-- begin-user-doc -->

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/GITBuildLocationImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/GITBuildLocationImpl.java
index 951910e..1b9c736 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/GITBuildLocationImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/GITBuildLocationImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -46,7 +48,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/GITGenerationLocationImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/GITGenerationLocationImpl.java
index bedca04..1b391c2 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/GITGenerationLocationImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/GITGenerationLocationImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -45,7 +47,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/GITImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/GITImpl.java
index f93218e..1409dd4 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/GITImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/GITImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -52,7 +54,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/GITLocationImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/GITLocationImpl.java
index 562871a..0c844ef 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/GITLocationImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/GITLocationImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -48,7 +50,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/SVNBuildLocationImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/SVNBuildLocationImpl.java
index 3977c00..588d551 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/SVNBuildLocationImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/SVNBuildLocationImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -46,7 +48,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/SVNGenerationLocationImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/SVNGenerationLocationImpl.java
index 02f2763..f99fdec 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/SVNGenerationLocationImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/SVNGenerationLocationImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -45,7 +47,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/SVNImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/SVNImpl.java
index ee95ff9..8f9b25b 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/SVNImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/SVNImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -50,7 +52,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/SVNLocationImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/SVNLocationImpl.java
index 23cbb82..f648d1e 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/SVNLocationImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/impl/SVNLocationImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -47,7 +49,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/util/BuildscmAdapterFactory.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/util/BuildscmAdapterFactory.java
index ffa56c7..3f5a46f 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/util/BuildscmAdapterFactory.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/util/BuildscmAdapterFactory.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -42,7 +44,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

 	 * The cached model package.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/util/BuildscmSwitch.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/util/BuildscmSwitch.java
index 8646c88..54fb7f9 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/util/BuildscmSwitch.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildscm/util/BuildscmSwitch.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -45,7 +47,7 @@
      * <!-- end-user-doc -->

 	 * @generated

 	 */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

 	 * The cached model package

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/AbstractBuildLocation.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/AbstractBuildLocation.java
index 4806700..62e7c81 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/AbstractBuildLocation.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/AbstractBuildLocation.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -31,7 +33,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/AbstractBuildLocationContainer.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/AbstractBuildLocationContainer.java
index 25c3303..2927fa55 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/AbstractBuildLocationContainer.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/AbstractBuildLocationContainer.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -38,7 +40,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/AggregateStep.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/AggregateStep.java
index e4b90b5..656b76d 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/AggregateStep.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/AggregateStep.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -41,7 +43,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/AntStep.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/AntStep.java
index e665b1f..47fa39a 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/AntStep.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/AntStep.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -39,7 +41,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/BinaryBuildLocation.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/BinaryBuildLocation.java
index d6b7d3d..c3e0581 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/BinaryBuildLocation.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/BinaryBuildLocation.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -36,7 +38,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/BuildLocationContainer.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/BuildLocationContainer.java
index 4ad4602..0ed99b6 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/BuildLocationContainer.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/BuildLocationContainer.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -37,7 +39,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/BuildStep.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/BuildStep.java
index 1af910a..93a6024 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/BuildStep.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/BuildStep.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -42,7 +44,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/BuildstepFactory.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/BuildstepFactory.java
index c00f6fc..4494b1e 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/BuildstepFactory.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/BuildstepFactory.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -29,7 +31,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

     /**

      * The singleton instance of the factory.

      * <!-- begin-user-doc -->

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/BuildstepPackage.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/BuildstepPackage.java
index 175d992..67500b6 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/BuildstepPackage.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/BuildstepPackage.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -42,7 +44,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * The package name.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/CLEAN_TYPE.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/CLEAN_TYPE.java
index 3846f7f..2f59984 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/CLEAN_TYPE.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/CLEAN_TYPE.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -80,7 +82,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * The '<em><b>RESULT</b></em>' literal value.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/CleanStep.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/CleanStep.java
index b73b7be..d037266 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/CleanStep.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/CleanStep.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -37,7 +39,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/Component.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/Component.java
index eb8b850..baf1e92 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/Component.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/Component.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -38,7 +40,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/EGFSystemProperty.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/EGFSystemProperty.java
index cf10cb7..009c3d3 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/EGFSystemProperty.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/EGFSystemProperty.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -31,7 +33,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/EgfActivity.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/EgfActivity.java
index 14ef5f4..ac99dad 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/EgfActivity.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/EgfActivity.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -37,7 +39,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/EgfStep.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/EgfStep.java
index d0a6e0c..876cc84 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/EgfStep.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/EgfStep.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -42,7 +44,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/Feature.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/Feature.java
index bc24be5..d7cbfcd 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/Feature.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/Feature.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -30,7 +32,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/InstallStep.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/InstallStep.java
index 9f14a8c..a6c7a65 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/InstallStep.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/InstallStep.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -48,7 +50,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/InstallStepBuildLocation.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/InstallStepBuildLocation.java
index 83549fa..8cf0649 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/InstallStepBuildLocation.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/InstallStepBuildLocation.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -36,7 +38,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/JavadocStep.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/JavadocStep.java
index 982d9dc..76d280b 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/JavadocStep.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/JavadocStep.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -42,7 +44,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/LocalBuildLocation.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/LocalBuildLocation.java
index acfd114..8dcb543 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/LocalBuildLocation.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/LocalBuildLocation.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -36,7 +38,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/PatternBuildLocation.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/PatternBuildLocation.java
index e91ad84..2fa4c8d 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/PatternBuildLocation.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/PatternBuildLocation.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -36,7 +38,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/Plugin.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/Plugin.java
index 1dde344..b8d810d 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/Plugin.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/Plugin.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -30,7 +32,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/PublishStep.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/PublishStep.java
index 68b0778..143498e 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/PublishStep.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/PublishStep.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -40,7 +42,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/ResultStep.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/ResultStep.java
index 853138a..8662197 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/ResultStep.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/ResultStep.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -32,7 +34,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/ResultStepBuildLocation.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/ResultStepBuildLocation.java
index 633ff34..2e4fd73 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/ResultStepBuildLocation.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/ResultStepBuildLocation.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -36,7 +38,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/RunningPlatformBuildLocation.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/RunningPlatformBuildLocation.java
index b71314d..0c2d319 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/RunningPlatformBuildLocation.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/RunningPlatformBuildLocation.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -30,7 +32,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/SourceBuildLocation.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/SourceBuildLocation.java
index f3f409f..f2a120c 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/SourceBuildLocation.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/SourceBuildLocation.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -36,7 +38,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/TargetPlatformBuildLocation.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/TargetPlatformBuildLocation.java
index 361b84b..a8af845 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/TargetPlatformBuildLocation.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/TargetPlatformBuildLocation.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -36,7 +38,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/TestStep.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/TestStep.java
index 6004214..6504b45 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/TestStep.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/TestStep.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -38,7 +40,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/UpdateSiteBuildLocation.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/UpdateSiteBuildLocation.java
index ae19a9d..86a2b5e 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/UpdateSiteBuildLocation.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/UpdateSiteBuildLocation.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -36,7 +38,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

 

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/AbstractBuildLocationContainerImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/AbstractBuildLocationContainerImpl.java
index 53d1ff2..daf4329 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/AbstractBuildLocationContainerImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/AbstractBuildLocationContainerImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -49,7 +51,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/AbstractBuildLocationImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/AbstractBuildLocationImpl.java
index b9e456e..a3b1436 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/AbstractBuildLocationImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/AbstractBuildLocationImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -35,7 +37,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * <!-- begin-user-doc -->

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/AggregateStepImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/AggregateStepImpl.java
index d9e8d84..1a9a547 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/AggregateStepImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/AggregateStepImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -51,7 +53,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/AntStepImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/AntStepImpl.java
index 2a90e0f..139bfef 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/AntStepImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/AntStepImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -45,7 +47,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/BinaryBuildLocationImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/BinaryBuildLocationImpl.java
index 3c91c70..0e90e3f 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/BinaryBuildLocationImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/BinaryBuildLocationImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -41,7 +43,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/BuildLocationContainerImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/BuildLocationContainerImpl.java
index 46e5ecd..732daaf 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/BuildLocationContainerImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/BuildLocationContainerImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -49,7 +51,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/BuildStepImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/BuildStepImpl.java
index 265d655..a0cd584 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/BuildStepImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/BuildStepImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -62,7 +64,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/BuildstepFactoryImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/BuildstepFactoryImpl.java
index 3f89207..b6bd175 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/BuildstepFactoryImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/BuildstepFactoryImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -41,7 +43,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * Creates the default factory implementation.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/BuildstepPackageImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/BuildstepPackageImpl.java
index f95d67e..06f411e 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/BuildstepPackageImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/BuildstepPackageImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -65,7 +67,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * <!-- begin-user-doc -->

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/CleanStepImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/CleanStepImpl.java
index eaf2a66..72c6eb0 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/CleanStepImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/CleanStepImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -44,7 +46,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/ComponentImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/ComponentImpl.java
index f4b58d2..6bc9b2a 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/ComponentImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/ComponentImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -48,7 +50,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/EGFSystemPropertyImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/EGFSystemPropertyImpl.java
index 4c09e74..be19efa 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/EGFSystemPropertyImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/EGFSystemPropertyImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -35,7 +37,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * <!-- begin-user-doc -->

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/EgfActivityImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/EgfActivityImpl.java
index b84aebf..fe1cc5b 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/EgfActivityImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/EgfActivityImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -42,7 +44,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/EgfStepImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/EgfStepImpl.java
index 75ed881..8578a69 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/EgfStepImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/EgfStepImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -59,7 +61,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/FeatureImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/FeatureImpl.java
index d88cd74..34edc51 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/FeatureImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/FeatureImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -33,7 +35,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * <!-- begin-user-doc -->

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/InstallStepBuildLocationImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/InstallStepBuildLocationImpl.java
index b38bd3a..e4f5425 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/InstallStepBuildLocationImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/InstallStepBuildLocationImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -43,7 +45,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/InstallStepImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/InstallStepImpl.java
index d806ec0..99bc10e 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/InstallStepImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/InstallStepImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -65,7 +67,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/JavadocStepImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/JavadocStepImpl.java
index 92d6e47..3f45e15 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/JavadocStepImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/JavadocStepImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -50,7 +52,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/LocalBuildLocationImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/LocalBuildLocationImpl.java
index 6ecf99f..e053525 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/LocalBuildLocationImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/LocalBuildLocationImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -41,7 +43,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/PatternBuildLocationImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/PatternBuildLocationImpl.java
index e5ec01b..728f605 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/PatternBuildLocationImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/PatternBuildLocationImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -41,7 +43,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/PluginImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/PluginImpl.java
index 4aec622..36bb63b 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/PluginImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/PluginImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -33,7 +35,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * <!-- begin-user-doc -->

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/PublishStepImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/PublishStepImpl.java
index 068b52e..30b6ec3 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/PublishStepImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/PublishStepImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -48,7 +50,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/ResultStepBuildLocationImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/ResultStepBuildLocationImpl.java
index 80438a2..423384c 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/ResultStepBuildLocationImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/ResultStepBuildLocationImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -43,7 +45,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/ResultStepImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/ResultStepImpl.java
index 3233ad1..a888f9c 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/ResultStepImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/ResultStepImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -36,7 +38,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * <!-- begin-user-doc -->

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/RunningPlatformBuildLocationImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/RunningPlatformBuildLocationImpl.java
index 554f026..c12c76d 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/RunningPlatformBuildLocationImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/RunningPlatformBuildLocationImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -33,7 +35,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * <!-- begin-user-doc -->

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/SourceBuildLocationImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/SourceBuildLocationImpl.java
index 621be2e..502892b 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/SourceBuildLocationImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/SourceBuildLocationImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -41,7 +43,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/TargetPlatformBuildLocationImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/TargetPlatformBuildLocationImpl.java
index 558f498..d953607 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/TargetPlatformBuildLocationImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/TargetPlatformBuildLocationImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -41,7 +43,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/TestStepImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/TestStepImpl.java
index a7a2912..d327d2d 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/TestStepImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/TestStepImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -44,7 +46,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/UpdateSiteBuildLocationImpl.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/UpdateSiteBuildLocationImpl.java
index 057844f..b7e8eeb 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/UpdateSiteBuildLocationImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/impl/UpdateSiteBuildLocationImpl.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -41,7 +43,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

 

     /**

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/util/BuildstepAdapterFactory.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/util/BuildstepAdapterFactory.java
index 2f19559..baa6091 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/util/BuildstepAdapterFactory.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/util/BuildstepAdapterFactory.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -40,7 +42,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * The cached model package.

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/util/BuildstepSwitch.java b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/util/BuildstepSwitch.java
index 0477f6d..637c329 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/util/BuildstepSwitch.java
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.build/src/org/eclipse/egf/portfolio/eclipse/build/buildstep/util/BuildstepSwitch.java
@@ -1,10 +1,12 @@
 /**

  *    Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *    All rights reserved. This program and the accompanying materials

- *    are made available under the terms of the Eclipse Public License v1.0

+ *    This program and the accompanying materials

+ *    are made available under the terms of the Eclipse Public License v2.0

  *    which accompanies this distribution, and is available at

- *    http://www.eclipse.org/legal/epl-v10.html

- *   

+ *    https://www.eclipse.org/legal/epl-v2.0

+ *

+ *    SPDX-License-Identifier: EPL-2.0

+ * 

  *    Contributors:

  *        Thales Corporate Services S.A.S - initial API and implementation

  *

@@ -43,7 +45,7 @@
      * <!-- end-user-doc -->

      * @generated

      */

-    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   All rights reserved. This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v1.0\r\n   which accompanies this distribution, and is available at\r\n   http://www.eclipse.org/legal/epl-v10.html\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

+    public static final String copyright = "   Copyright (c) 2009-2010 Thales Corporate Services S.A.S.\r\n   This program and the accompanying materials\r\n   are made available under the terms of the Eclipse Public License v2.0\r\n   which accompanies this distribution, and is available at\r\n   https://www.eclipse.org/legal/epl-v2.0\r\n  \r\n  SPDX-License-Identifier: EPL-2.0\r\n  \r\n   Contributors:\r\n       Thales Corporate Services S.A.S - initial API and implementation";

 

     /**

      * The cached model package

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.util/build.properties b/portfolio/org.eclipse.egf.portfolio.eclipse.util/build.properties
index 5b381aa..4940d6c 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.util/build.properties
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.util/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.util/plugin.properties b/portfolio/org.eclipse.egf.portfolio.eclipse.util/plugin.properties
index ce36bcc..d9e631a 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.util/plugin.properties
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.util/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.util/plugin.xml b/portfolio/org.eclipse.egf.portfolio.eclipse.util/plugin.xml
index 059da58..3a90e55 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.util/plugin.xml
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.util/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.eclipse.util/templates/plugin.properties b/portfolio/org.eclipse.egf.portfolio.eclipse.util/templates/plugin.properties
index bc81c0e..d2400a7 100644
--- a/portfolio/org.eclipse.egf.portfolio.eclipse.util/templates/plugin.properties
+++ b/portfolio/org.eclipse.egf.portfolio.eclipse.util/templates/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) <%copyright%>

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      <%contributors%>

diff --git a/portfolio/org.eclipse.egf.portfolio.egf/build.properties b/portfolio/org.eclipse.egf.portfolio.egf/build.properties
index 7c9b094..69db936 100644
--- a/portfolio/org.eclipse.egf.portfolio.egf/build.properties
+++ b/portfolio/org.eclipse.egf.portfolio.egf/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009, 2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.file.resources/build.properties b/portfolio/org.eclipse.egf.portfolio.file.resources/build.properties
index 7d8add5..36ff3af 100644
--- a/portfolio/org.eclipse.egf.portfolio.file.resources/build.properties
+++ b/portfolio/org.eclipse.egf.portfolio.file.resources/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.file.resources/plugin.properties b/portfolio/org.eclipse.egf.portfolio.file.resources/plugin.properties
index 6ffa328..287f62d 100644
--- a/portfolio/org.eclipse.egf.portfolio.file.resources/plugin.properties
+++ b/portfolio/org.eclipse.egf.portfolio.file.resources/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.file.resources/plugin.xml b/portfolio/org.eclipse.egf.portfolio.file.resources/plugin.xml
index 9143a45..676c52c 100644
--- a/portfolio/org.eclipse.egf.portfolio.file.resources/plugin.xml
+++ b/portfolio/org.eclipse.egf.portfolio.file.resources/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/DeleteFileTask.java b/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/DeleteFileTask.java
index 3d549af..895d6d5 100644
--- a/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/DeleteFileTask.java
+++ b/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/DeleteFileTask.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/EGFFileResourcesActivator.java b/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/EGFFileResourcesActivator.java
index 891e5c2..8c127ca 100644
--- a/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/EGFFileResourcesActivator.java
+++ b/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/EGFFileResourcesActivator.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/EclipseDeleteFileTask.java b/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/EclipseDeleteFileTask.java
index 12afef0..781cfe8 100644
--- a/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/EclipseDeleteFileTask.java
+++ b/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/EclipseDeleteFileTask.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/FileConstants.java b/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/FileConstants.java
index 410b784..a7cae0e 100644
--- a/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/FileConstants.java
+++ b/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/FileConstants.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/FileUtil.java b/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/FileUtil.java
index 76b8d84..5c1dd0b 100644
--- a/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/FileUtil.java
+++ b/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/FileUtil.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/ReadFileTask.java b/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/ReadFileTask.java
index 386b24c..486b040 100644
--- a/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/ReadFileTask.java
+++ b/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/ReadFileTask.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/RefreshProjectTask.java b/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/RefreshProjectTask.java
index 4ab2004..6231f2a 100644
--- a/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/RefreshProjectTask.java
+++ b/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/RefreshProjectTask.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/RenameFileTask.java b/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/RenameFileTask.java
index 06818d4..0303f75 100644
--- a/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/RenameFileTask.java
+++ b/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/RenameFileTask.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/WriteFileTask.java b/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/WriteFileTask.java
index 1d09c9a..cb4fddd 100644
--- a/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/WriteFileTask.java
+++ b/portfolio/org.eclipse.egf.portfolio.file.resources/src/org/eclipse/egf/portfolio/file/resources/WriteFileTask.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model.edit/build.properties b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model.edit/build.properties
index 21d346d..c53d50b 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model.edit/build.properties
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model.edit/build.properties
@@ -1,9 +1,12 @@
 ###############################################################################

 # Copyright (c) 2018 Thales Global Services S.A.S.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 #  

 # Contributors:

 #   Thales Global Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model.edit/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/provider/CdoExtensionEditPlugin.java b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model.edit/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/provider/CdoExtensionEditPlugin.java
index fc3a3d9..50549b6 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model.edit/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/provider/CdoExtensionEditPlugin.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model.edit/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/provider/CdoExtensionEditPlugin.java
@@ -1,10 +1,12 @@
 /*******************************************************************************

  * Copyright (c) 2014 Thales Global Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *  

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  *   Thales Global Services S.A.S - initial API and implementation

  *******************************************************************************/

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model.edit/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/provider/CdoExtensionItemProviderAdapterFactory.java b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model.edit/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/provider/CdoExtensionItemProviderAdapterFactory.java
index 4d581ee..29f8b9e 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model.edit/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/provider/CdoExtensionItemProviderAdapterFactory.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model.edit/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/provider/CdoExtensionItemProviderAdapterFactory.java
@@ -1,10 +1,12 @@
 /*******************************************************************************

  * Copyright (c) 2014 Thales Global Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *  

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  *   Thales Global Services S.A.S - initial API and implementation

  *******************************************************************************/

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model.edit/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/provider/CdoGenerationItemProvider.java b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model.edit/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/provider/CdoGenerationItemProvider.java
index 6e8d83b..6f2a736 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model.edit/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/provider/CdoGenerationItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model.edit/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/provider/CdoGenerationItemProvider.java
@@ -1,10 +1,12 @@
 /*******************************************************************************

  * Copyright (c) 2014 Thales Global Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *  

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  *   Thales Global Services S.A.S - initial API and implementation

  *******************************************************************************/

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model.edit/plugin.properties b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model.edit/plugin.properties
index 7c4129b..0636f0f 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model.edit/plugin.properties
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model.edit/plugin.properties
@@ -1,9 +1,12 @@
 ###############################################################################

 # Copyright (c) 2018 Thales Global Services S.A.S.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 #  

 # Contributors:

 #   Thales Global Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/build.properties b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/build.properties
index 3f6bee4..60a48ef 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/build.properties
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/build.properties
@@ -1,9 +1,12 @@
 ###############################################################################

 # Copyright (c) 2018 Thales Global Services S.A.S.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 #  

 # Contributors:

 #   Thales Global Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/CdoExtensionFactory.java b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/CdoExtensionFactory.java
index 2e2dc96..74d6a60 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/CdoExtensionFactory.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/CdoExtensionFactory.java
@@ -1,10 +1,12 @@
 /*******************************************************************************

  * Copyright (c) 2014 Thales Global Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *  

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  *   Thales Global Services S.A.S - initial API and implementation

  *******************************************************************************/

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/CdoExtensionModelPlugin.java b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/CdoExtensionModelPlugin.java
index 794be52..4586c12 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/CdoExtensionModelPlugin.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/CdoExtensionModelPlugin.java
@@ -1,10 +1,12 @@
 /*******************************************************************************

  * Copyright (c) 2014 Thales Global Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *  

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  *   Thales Global Services S.A.S - initial API and implementation

  *******************************************************************************/

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/CdoExtensionPackage.java b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/CdoExtensionPackage.java
index 1fd55cc..f0666d6 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/CdoExtensionPackage.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/CdoExtensionPackage.java
@@ -1,10 +1,12 @@
 /*******************************************************************************

  * Copyright (c) 2014 Thales Global Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *  

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  *   Thales Global Services S.A.S - initial API and implementation

  *******************************************************************************/

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/CdoGeneration.java b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/CdoGeneration.java
index 6d6b60d..2971884 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/CdoGeneration.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/CdoGeneration.java
@@ -1,10 +1,12 @@
 /*******************************************************************************

  * Copyright (c) 2014 Thales Global Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *  

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  *   Thales Global Services S.A.S - initial API and implementation

  *******************************************************************************/

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/impl/CdoExtensionFactoryImpl.java b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/impl/CdoExtensionFactoryImpl.java
index 2f91a85..f36fab6 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/impl/CdoExtensionFactoryImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/impl/CdoExtensionFactoryImpl.java
@@ -1,10 +1,12 @@
 /*******************************************************************************

  * Copyright (c) 2014 Thales Global Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *  

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  *   Thales Global Services S.A.S - initial API and implementation

  *******************************************************************************/

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/impl/CdoExtensionPackageImpl.java b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/impl/CdoExtensionPackageImpl.java
index 4e56839..c07928a 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/impl/CdoExtensionPackageImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/impl/CdoExtensionPackageImpl.java
@@ -1,10 +1,12 @@
 /*******************************************************************************

  * Copyright (c) 2014 Thales Global Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *  

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  *   Thales Global Services S.A.S - initial API and implementation

  *******************************************************************************/

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/impl/CdoGenerationImpl.java b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/impl/CdoGenerationImpl.java
index db9fe25..c9c3a55 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/impl/CdoGenerationImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/impl/CdoGenerationImpl.java
@@ -1,10 +1,12 @@
 /*******************************************************************************

  * Copyright (c) 2014 Thales Global Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *  

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  *   Thales Global Services S.A.S - initial API and implementation

  *******************************************************************************/

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/util/CdoExtensionAdapterFactory.java b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/util/CdoExtensionAdapterFactory.java
index f9738e9..8c8a20e 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/util/CdoExtensionAdapterFactory.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/util/CdoExtensionAdapterFactory.java
@@ -1,10 +1,12 @@
 /*******************************************************************************

  * Copyright (c) 2014 Thales Global Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *  

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  *   Thales Global Services S.A.S - initial API and implementation

  *******************************************************************************/

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/util/CdoExtensionSwitch.java b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/util/CdoExtensionSwitch.java
index 8287ff8..6ae8040 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/util/CdoExtensionSwitch.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/generated/org/eclipse/egf/portfolio/genchain/cdo/cdoExtension/util/CdoExtensionSwitch.java
@@ -1,10 +1,12 @@
 /*******************************************************************************

  * Copyright (c) 2014 Thales Global Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *  

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ * 

  * Contributors:

  *   Thales Global Services S.A.S - initial API and implementation

  *******************************************************************************/

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/plugin.properties b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/plugin.properties
index 3f0796e..e3f69de 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/plugin.properties
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.cdo.model/plugin.properties
@@ -1,9 +1,12 @@
 ###############################################################################

 # Copyright (c) 2018 Thales Global Services S.A.S.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 #  

 # Contributors:

 #   Thales Global Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.cdo/build.properties b/portfolio/org.eclipse.egf.portfolio.genchain.cdo/build.properties
index 5293ff4..b87a4d4 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.cdo/build.properties
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.cdo/build.properties
@@ -1,9 +1,12 @@
 ###############################################################################

 # Copyright (c) 2018 Thales Global Services S.A.S.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 #  

 # Contributors:

 #   Thales Global Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.cdo/plugin.properties b/portfolio/org.eclipse.egf.portfolio.genchain.cdo/plugin.properties
index 29a3ba6..09b84f8 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.cdo/plugin.properties
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.cdo/plugin.properties
@@ -1,9 +1,12 @@
 ###############################################################################

 # Copyright (c) 2018 Thales Global Services S.A.S.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 #  

 # Contributors:

 #   Thales Global Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.cdo/src/org/eclipse/egf/portfolio/genchain/cdo/CdoGenerationExtension.java b/portfolio/org.eclipse.egf.portfolio.genchain.cdo/src/org/eclipse/egf/portfolio/genchain/cdo/CdoGenerationExtension.java
index b662752..89c5732 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.cdo/src/org/eclipse/egf/portfolio/genchain/cdo/CdoGenerationExtension.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.cdo/src/org/eclipse/egf/portfolio/genchain/cdo/CdoGenerationExtension.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2018 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/build.properties b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/build.properties
index 2275da4..9053a17 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/build.properties
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009, 2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties
index 7853d2b..f47dd2d 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java
index 2d4061d..edafded 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionEditPlugin.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2011 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java
index d41dcbb..705d668 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsExtensionItemProviderAdapterFactory.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2011 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java
index 8a89c45..9e1510e 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools.edit/src/org/eclipse/egf/portfolio/genchain/ecoretools/ecoreToolsExtension/provider/EcoreToolsGenerationItemProvider.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2011 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/build.properties b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/build.properties
index ec8d93c..a609e01 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/build.properties
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009, 2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties
index ab318bd..94d5f5b 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java
index 2d55b6e..e7b6c30 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/Activator.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2011 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java
index e66ccc3..c18717a 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/EcoreToolsExtension.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2011 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateEdgeCommand.java b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateEdgeCommand.java
index 52dcd29..e5b909d 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateEdgeCommand.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateEdgeCommand.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2014, 2017 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateNodeCommand.java b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateNodeCommand.java
index e69ff13..e734f83 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateNodeCommand.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateNodeCommand.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2014 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/operation/CreateEcoreTools2RepresentationOperation.java b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/operation/CreateEcoreTools2RepresentationOperation.java
index 8cd6dec..45c56f1 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/operation/CreateEcoreTools2RepresentationOperation.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/operation/CreateEcoreTools2RepresentationOperation.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2014 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java
index 1dbf352..2fe07d4 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/task/EcoreToolsTaskProduction.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2014 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.edit/build.properties b/portfolio/org.eclipse.egf.portfolio.genchain.edit/build.properties
index 8027ca3..8ec2eea 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.edit/build.properties
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.edit/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009, 2018 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/DocumentationGenerationItemProvider.java b/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/DocumentationGenerationItemProvider.java
index 7b95efb..ae5a176 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/DocumentationGenerationItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/DocumentationGenerationItemProvider.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/EcoreElementItemProvider.java b/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/EcoreElementItemProvider.java
index eadc453..b091537 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/EcoreElementItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/EcoreElementItemProvider.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/EmfGenerationItemProvider.java b/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/EmfGenerationItemProvider.java
index 53f0998..cac7d49 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/EmfGenerationItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/EmfGenerationItemProvider.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/FeatureAdditionItemProvider.java b/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/FeatureAdditionItemProvider.java
index b580faf..a9ce28f 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/FeatureAdditionItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/FeatureAdditionItemProvider.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/GenerationChainEditPlugin.java b/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/GenerationChainEditPlugin.java
index a50772b..b14e77d 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/GenerationChainEditPlugin.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/GenerationChainEditPlugin.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/GenerationChainItemProvider.java b/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/GenerationChainItemProvider.java
index a734aad..4b5a166 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/GenerationChainItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/GenerationChainItemProvider.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/GenerationChainItemProviderAdapterFactory.java b/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/GenerationChainItemProviderAdapterFactory.java
index 7c7b83e..b793534 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/GenerationChainItemProviderAdapterFactory.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/GenerationChainItemProviderAdapterFactory.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/GenerationElementItemProvider.java b/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/GenerationElementItemProvider.java
index b7b7cfa..31cf7c9 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/GenerationElementItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/GenerationElementItemProvider.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/PluginAdditionItemProvider.java b/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/PluginAdditionItemProvider.java
index 9e88bcb..d70b823 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/PluginAdditionItemProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.edit/generated/org/eclipse/egf/portfolio/genchain/generationChain/provider/PluginAdditionItemProvider.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.edit/plugin.properties b/portfolio/org.eclipse.egf.portfolio.genchain.edit/plugin.properties
index e63b2b7..e5de700 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.edit/plugin.properties
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.edit/plugin.properties
@@ -1,10 +1,13 @@
 
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.editor/build.properties b/portfolio/org.eclipse.egf.portfolio.genchain.editor/build.properties
index 8027ca3..8ec2eea 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.editor/build.properties
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.editor/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009, 2018 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.editor/generated/org/eclipse/egf/portfolio/genchain/generationChain/presentation/GenerationChainActionBarContributor.java b/portfolio/org.eclipse.egf.portfolio.genchain.editor/generated/org/eclipse/egf/portfolio/genchain/generationChain/presentation/GenerationChainActionBarContributor.java
index d579e16..d4138e4 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.editor/generated/org/eclipse/egf/portfolio/genchain/generationChain/presentation/GenerationChainActionBarContributor.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.editor/generated/org/eclipse/egf/portfolio/genchain/generationChain/presentation/GenerationChainActionBarContributor.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.editor/generated/org/eclipse/egf/portfolio/genchain/generationChain/presentation/GenerationChainEditor.java b/portfolio/org.eclipse.egf.portfolio.genchain.editor/generated/org/eclipse/egf/portfolio/genchain/generationChain/presentation/GenerationChainEditor.java
index dbed87a..7552cce 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.editor/generated/org/eclipse/egf/portfolio/genchain/generationChain/presentation/GenerationChainEditor.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.editor/generated/org/eclipse/egf/portfolio/genchain/generationChain/presentation/GenerationChainEditor.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.editor/generated/org/eclipse/egf/portfolio/genchain/generationChain/presentation/GenerationChainEditorPlugin.java b/portfolio/org.eclipse.egf.portfolio.genchain.editor/generated/org/eclipse/egf/portfolio/genchain/generationChain/presentation/GenerationChainEditorPlugin.java
index d0dc775..ed7e870 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.editor/generated/org/eclipse/egf/portfolio/genchain/generationChain/presentation/GenerationChainEditorPlugin.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.editor/generated/org/eclipse/egf/portfolio/genchain/generationChain/presentation/GenerationChainEditorPlugin.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.editor/generated/org/eclipse/egf/portfolio/genchain/generationChain/presentation/GenerationChainModelWizard.java b/portfolio/org.eclipse.egf.portfolio.genchain.editor/generated/org/eclipse/egf/portfolio/genchain/generationChain/presentation/GenerationChainModelWizard.java
index 2ecf204..b78d121 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.editor/generated/org/eclipse/egf/portfolio/genchain/generationChain/presentation/GenerationChainModelWizard.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.editor/generated/org/eclipse/egf/portfolio/genchain/generationChain/presentation/GenerationChainModelWizard.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.editor/plugin.properties b/portfolio/org.eclipse.egf.portfolio.genchain.editor/plugin.properties
index 958f2c3..38ed4e2 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.editor/plugin.properties
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.editor/plugin.properties
@@ -1,10 +1,13 @@
 
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/build.properties b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/build.properties
index 2a077a6..78552e7 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/build.properties
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/plugin.properties b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/plugin.properties
index d063330..7467878 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/plugin.properties
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/plugin.xml b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/plugin.xml
index 24c2c18..37d51c9 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/plugin.xml
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/Messages.java b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/Messages.java
index 85324c8..681ebdf 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/Messages.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/Messages.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/actions/BuildApplicationAction.java b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/actions/BuildApplicationAction.java
index 8ef5388..9a2158d 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/actions/BuildApplicationAction.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/actions/BuildApplicationAction.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2014 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/actions/BuildApplicationHelper.java b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/actions/BuildApplicationHelper.java
index 8c2289f..e3beefd 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/actions/BuildApplicationHelper.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/actions/BuildApplicationHelper.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2014, 2017 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/actions/CreateFcoreAction.java b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/actions/CreateFcoreAction.java
index 493e51b..07a3c5a 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/actions/CreateFcoreAction.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/actions/CreateFcoreAction.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/actions/CreateFcoreHelper.java b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/actions/CreateFcoreHelper.java
index 3036248..e7b3f72 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/actions/CreateFcoreHelper.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/actions/CreateFcoreHelper.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/EcoreModelPage.java b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/EcoreModelPage.java
index 2af462f..9725999 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/EcoreModelPage.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/EcoreModelPage.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/GenerationChainFactory.java b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/GenerationChainFactory.java
index 87b5ade..f9a81dd 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/GenerationChainFactory.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/GenerationChainFactory.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/GenerationChainWizard.java b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/GenerationChainWizard.java
index 15012c0..45198b1 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/GenerationChainWizard.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/GenerationChainWizard.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/NewFilePage.java b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/NewFilePage.java
index bf2d389..0403351 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/NewFilePage.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/NewFilePage.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/Node.java b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/Node.java
index 654edcc..8b3084a 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/Node.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/Node.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/NodeContentProvider.java b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/NodeContentProvider.java
index 72dbb72..e081e1a 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/NodeContentProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/NodeContentProvider.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/NodeLabelProvider.java b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/NodeLabelProvider.java
index 88c322f..0694baa 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/NodeLabelProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/NodeLabelProvider.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/NodeTypes.java b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/NodeTypes.java
index aceb04b..b804bda 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/NodeTypes.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools.ui/src/org/eclipse/egf/portfolio/genchain/tools/ui/wizards/NodeTypes.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools/build.properties b/portfolio/org.eclipse.egf.portfolio.genchain.tools/build.properties
index 9a135f6..42b9e8c 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools/build.properties
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools/plugin.properties b/portfolio/org.eclipse.egf.portfolio.genchain.tools/plugin.properties
index 45bd68d..ddbae2c 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools/plugin.properties
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools/plugin.xml b/portfolio/org.eclipse.egf.portfolio.genchain.tools/plugin.xml
index 20f8aeb..a8524fe 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools/plugin.xml
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/Activator.java b/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/Activator.java
index 30930ea..77d2c62 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/Activator.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/Activator.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/BuildFcoreReporter.java b/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/BuildFcoreReporter.java
index 5357f81..c519730 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/BuildFcoreReporter.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/BuildFcoreReporter.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/FcoreBuilderConstants.java b/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/FcoreBuilderConstants.java
index af3a92e..4c751c4 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/FcoreBuilderConstants.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/FcoreBuilderConstants.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/FcoreBuilderTask.java b/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/FcoreBuilderTask.java
index 153c493..146d1a8 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/FcoreBuilderTask.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/FcoreBuilderTask.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/utils/ActivityInvocationHelper.java b/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/utils/ActivityInvocationHelper.java
index b8868b8..f96ee7e 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/utils/ActivityInvocationHelper.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/utils/ActivityInvocationHelper.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/utils/DocumentationHelper.java b/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/utils/DocumentationHelper.java
index c6f8a37..21ef9d6 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/utils/DocumentationHelper.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/utils/DocumentationHelper.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/utils/EcoreImporterHelper.java b/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/utils/EcoreImporterHelper.java
index ea4a859..d4ef3ce 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/utils/EcoreImporterHelper.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/utils/EcoreImporterHelper.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  *
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/utils/FCMatcher.java b/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/utils/FCMatcher.java
index 64b5792..ceab348 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/utils/FCMatcher.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/utils/FCMatcher.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/utils/QualifierReplacer.java b/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/utils/QualifierReplacer.java
index e96a174..b0ebf42 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/utils/QualifierReplacer.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/utils/QualifierReplacer.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/utils/RunActivityHelper.java b/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/utils/RunActivityHelper.java
index 20f10fc..fb9aeac 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/utils/RunActivityHelper.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.tools/src/org/eclipse/egf/portfolio/genchain/tools/utils/RunActivityHelper.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/build.properties b/portfolio/org.eclipse.egf.portfolio.genchain/build.properties
index 6ae8bf8..70a3176 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/build.properties
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/DocumentationGeneration.java b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/DocumentationGeneration.java
index c15c132..c156c5d 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/DocumentationGeneration.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/DocumentationGeneration.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/EcoreElement.java b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/EcoreElement.java
index 1c94338..3170d9e 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/EcoreElement.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/EcoreElement.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/EmfGeneration.java b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/EmfGeneration.java
index d730074..6ed4ee2 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/EmfGeneration.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/EmfGeneration.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/FeatureAddition.java b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/FeatureAddition.java
index 3bbdb2d..ca8a64a 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/FeatureAddition.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/FeatureAddition.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/GenerationChain.java b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/GenerationChain.java
index 89df8e4..f1f2092 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/GenerationChain.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/GenerationChain.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/GenerationChainFactory.java b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/GenerationChainFactory.java
index d985322..a6e890d 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/GenerationChainFactory.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/GenerationChainFactory.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/GenerationChainPackage.java b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/GenerationChainPackage.java
index e330a96..2991124 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/GenerationChainPackage.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/GenerationChainPackage.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/GenerationElement.java b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/GenerationElement.java
index c77ef3a..97a1d33 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/GenerationElement.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/GenerationElement.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/PluginAddition.java b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/PluginAddition.java
index 8bd20e0..169c7fd 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/PluginAddition.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/PluginAddition.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/PluginProvider.java b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/PluginProvider.java
index 6b9214b..9a5b5e8 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/PluginProvider.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/PluginProvider.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/DocumentationGenerationImpl.java b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/DocumentationGenerationImpl.java
index adf775e..2b17c7c 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/DocumentationGenerationImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/DocumentationGenerationImpl.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/EcoreElementImpl.java b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/EcoreElementImpl.java
index 7a1055c..4e9cf5b 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/EcoreElementImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/EcoreElementImpl.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/EmfGenerationImpl.java b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/EmfGenerationImpl.java
index f3b28a8..747ffd1 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/EmfGenerationImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/EmfGenerationImpl.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/FeatureAdditionImpl.java b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/FeatureAdditionImpl.java
index 6922513..5842c78 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/FeatureAdditionImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/FeatureAdditionImpl.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/GenerationChainFactoryImpl.java b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/GenerationChainFactoryImpl.java
index 1eb4010..dab71d8 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/GenerationChainFactoryImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/GenerationChainFactoryImpl.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/GenerationChainImpl.java b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/GenerationChainImpl.java
index e400bd7..d7c6b8d 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/GenerationChainImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/GenerationChainImpl.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/GenerationChainPackageImpl.java b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/GenerationChainPackageImpl.java
index c505430..823464f 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/GenerationChainPackageImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/GenerationChainPackageImpl.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/GenerationElementImpl.java b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/GenerationElementImpl.java
index 372c6bf..a382681 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/GenerationElementImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/GenerationElementImpl.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/PluginAdditionImpl.java b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/PluginAdditionImpl.java
index 675846a..eef5160 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/PluginAdditionImpl.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/impl/PluginAdditionImpl.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/util/GenerationChainAdapterFactory.java b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/util/GenerationChainAdapterFactory.java
index bd6f8e0..09ef210 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/util/GenerationChainAdapterFactory.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/util/GenerationChainAdapterFactory.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/util/GenerationChainSwitch.java b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/util/GenerationChainSwitch.java
index 03db283..9fd9546 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/util/GenerationChainSwitch.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/generated/org/eclipse/egf/portfolio/genchain/generationChain/util/GenerationChainSwitch.java
@@ -1,10 +1,12 @@
 /**
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/plugin.properties b/portfolio/org.eclipse.egf.portfolio.genchain/plugin.properties
index d7a047a..8718e07 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/plugin.properties
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/src/org/eclipse/egf/portfolio/genchain/Messages.java b/portfolio/org.eclipse.egf.portfolio.genchain/src/org/eclipse/egf/portfolio/genchain/Messages.java
index 0df3c8e..ffcbefe 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/src/org/eclipse/egf/portfolio/genchain/Messages.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/src/org/eclipse/egf/portfolio/genchain/Messages.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/src/org/eclipse/egf/portfolio/genchain/extension/DefaultEmfDocumentationExtension.java b/portfolio/org.eclipse.egf.portfolio.genchain/src/org/eclipse/egf/portfolio/genchain/extension/DefaultEmfDocumentationExtension.java
index 85d48d9..dd57e3b 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/src/org/eclipse/egf/portfolio/genchain/extension/DefaultEmfDocumentationExtension.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/src/org/eclipse/egf/portfolio/genchain/extension/DefaultEmfDocumentationExtension.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/src/org/eclipse/egf/portfolio/genchain/extension/DefaultEmfGenerationExtension.java b/portfolio/org.eclipse.egf.portfolio.genchain/src/org/eclipse/egf/portfolio/genchain/extension/DefaultEmfGenerationExtension.java
index 3f09955..17943a0 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/src/org/eclipse/egf/portfolio/genchain/extension/DefaultEmfGenerationExtension.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/src/org/eclipse/egf/portfolio/genchain/extension/DefaultEmfGenerationExtension.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/src/org/eclipse/egf/portfolio/genchain/extension/ExtensionHelper.java b/portfolio/org.eclipse.egf.portfolio.genchain/src/org/eclipse/egf/portfolio/genchain/extension/ExtensionHelper.java
index c724a1f..a772aed 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/src/org/eclipse/egf/portfolio/genchain/extension/ExtensionHelper.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/src/org/eclipse/egf/portfolio/genchain/extension/ExtensionHelper.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/src/org/eclipse/egf/portfolio/genchain/extension/ExtensionProperties.java b/portfolio/org.eclipse.egf.portfolio.genchain/src/org/eclipse/egf/portfolio/genchain/extension/ExtensionProperties.java
index 58b565f..08284bb 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/src/org/eclipse/egf/portfolio/genchain/extension/ExtensionProperties.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/src/org/eclipse/egf/portfolio/genchain/extension/ExtensionProperties.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain/src/org/eclipse/egf/portfolio/genchain/utils/StringUtils.java b/portfolio/org.eclipse.egf.portfolio.genchain/src/org/eclipse/egf/portfolio/genchain/utils/StringUtils.java
index 8a5ab18..bf299b2 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain/src/org/eclipse/egf/portfolio/genchain/utils/StringUtils.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain/src/org/eclipse/egf/portfolio/genchain/utils/StringUtils.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.task.acceleo3.ui/build.properties b/portfolio/org.eclipse.egf.portfolio.task.acceleo3.ui/build.properties
index 071dfb6..fa277bf 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.acceleo3.ui/build.properties
+++ b/portfolio/org.eclipse.egf.portfolio.task.acceleo3.ui/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2011 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.acceleo3.ui/plugin.properties b/portfolio/org.eclipse.egf.portfolio.task.acceleo3.ui/plugin.properties
index bdf90ed..fba095c 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.acceleo3.ui/plugin.properties
+++ b/portfolio/org.eclipse.egf.portfolio.task.acceleo3.ui/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2011 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.acceleo3.ui/plugin.xml b/portfolio/org.eclipse.egf.portfolio.task.acceleo3.ui/plugin.xml
index 444456e..b2107f6 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.acceleo3.ui/plugin.xml
+++ b/portfolio/org.eclipse.egf.portfolio.task.acceleo3.ui/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.4"?>

 <!--

      Copyright (c) 2009-2011 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.acceleo3.ui/src/org/eclipse/egf/portfolio/task/acceleo3/ui/Messages.java b/portfolio/org.eclipse.egf.portfolio.task.acceleo3.ui/src/org/eclipse/egf/portfolio/task/acceleo3/ui/Messages.java
index c2d32ca..c60db83 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.acceleo3.ui/src/org/eclipse/egf/portfolio/task/acceleo3/ui/Messages.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.acceleo3.ui/src/org/eclipse/egf/portfolio/task/acceleo3/ui/Messages.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2011 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.task.acceleo3.ui/src/org/eclipse/egf/portfolio/task/acceleo3/ui/contributions/Acceleo3TaskEditorContributor.java b/portfolio/org.eclipse.egf.portfolio.task.acceleo3.ui/src/org/eclipse/egf/portfolio/task/acceleo3/ui/contributions/Acceleo3TaskEditorContributor.java
index eaa3d54..5885a0a 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.acceleo3.ui/src/org/eclipse/egf/portfolio/task/acceleo3/ui/contributions/Acceleo3TaskEditorContributor.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.acceleo3.ui/src/org/eclipse/egf/portfolio/task/acceleo3/ui/contributions/Acceleo3TaskEditorContributor.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2011 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.acceleo3.ui/src/org/eclipse/egf/portfolio/task/acceleo3/ui/messages.properties b/portfolio/org.eclipse.egf.portfolio.task.acceleo3.ui/src/org/eclipse/egf/portfolio/task/acceleo3/ui/messages.properties
index 9a29e5f..a9f2936 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.acceleo3.ui/src/org/eclipse/egf/portfolio/task/acceleo3/ui/messages.properties
+++ b/portfolio/org.eclipse.egf.portfolio.task.acceleo3.ui/src/org/eclipse/egf/portfolio/task/acceleo3/ui/messages.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2011 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.acceleo3/build.properties b/portfolio/org.eclipse.egf.portfolio.task.acceleo3/build.properties
index 071dfb6..fa277bf 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.acceleo3/build.properties
+++ b/portfolio/org.eclipse.egf.portfolio.task.acceleo3/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2011 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.acceleo3/plugin.properties b/portfolio/org.eclipse.egf.portfolio.task.acceleo3/plugin.properties
index a9cd91d..9203125 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.acceleo3/plugin.properties
+++ b/portfolio/org.eclipse.egf.portfolio.task.acceleo3/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.acceleo3/plugin.xml b/portfolio/org.eclipse.egf.portfolio.task.acceleo3/plugin.xml
index 6f21a83..074f5c1 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.acceleo3/plugin.xml
+++ b/portfolio/org.eclipse.egf.portfolio.task.acceleo3/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.4"?>

 <!--

      Copyright (c) 2009-2011 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.acceleo3/src/org/eclipse/egf/portfolio/task/acceleo3/Messages.java b/portfolio/org.eclipse.egf.portfolio.task.acceleo3/src/org/eclipse/egf/portfolio/task/acceleo3/Messages.java
index 8742909..695b05b 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.acceleo3/src/org/eclipse/egf/portfolio/task/acceleo3/Messages.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.acceleo3/src/org/eclipse/egf/portfolio/task/acceleo3/Messages.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2011 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.task.acceleo3/src/org/eclipse/egf/portfolio/task/acceleo3/engine/Acceleo3ScriptEngine.java b/portfolio/org.eclipse.egf.portfolio.task.acceleo3/src/org/eclipse/egf/portfolio/task/acceleo3/engine/Acceleo3ScriptEngine.java
index 4bc9283..85a019b 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.acceleo3/src/org/eclipse/egf/portfolio/task/acceleo3/engine/Acceleo3ScriptEngine.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.acceleo3/src/org/eclipse/egf/portfolio/task/acceleo3/engine/Acceleo3ScriptEngine.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2011 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.acceleo3/src/org/eclipse/egf/portfolio/task/acceleo3/engine/Acceleo3TaskNature.java b/portfolio/org.eclipse.egf.portfolio.task.acceleo3/src/org/eclipse/egf/portfolio/task/acceleo3/engine/Acceleo3TaskNature.java
index 9946170..28d1146 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.acceleo3/src/org/eclipse/egf/portfolio/task/acceleo3/engine/Acceleo3TaskNature.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.acceleo3/src/org/eclipse/egf/portfolio/task/acceleo3/engine/Acceleo3TaskNature.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2011 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.acceleo3/src/org/eclipse/egf/portfolio/task/acceleo3/messages.properties b/portfolio/org.eclipse.egf.portfolio.task.acceleo3/src/org/eclipse/egf/portfolio/task/acceleo3/messages.properties
index da4f1c6..488a908 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.acceleo3/src/org/eclipse/egf/portfolio/task/acceleo3/messages.properties
+++ b/portfolio/org.eclipse.egf.portfolio.task.acceleo3/src/org/eclipse/egf/portfolio/task/acceleo3/messages.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2011 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.ant.ui/build.properties b/portfolio/org.eclipse.egf.portfolio.task.ant.ui/build.properties
index 3d072cd..550ee4d 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.ant.ui/build.properties
+++ b/portfolio/org.eclipse.egf.portfolio.task.ant.ui/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.ant.ui/plugin.properties b/portfolio/org.eclipse.egf.portfolio.task.ant.ui/plugin.properties
index c78bb75..a001299 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.ant.ui/plugin.properties
+++ b/portfolio/org.eclipse.egf.portfolio.task.ant.ui/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/Activator.java b/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/Activator.java
index 928b32e..5f32310 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/Activator.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/Activator.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/Messages.java b/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/Messages.java
index 010b4bf..92e21d4 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/Messages.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/Messages.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/contributions/OpenAntTaskImplementationListenerContributor.java b/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/contributions/OpenAntTaskImplementationListenerContributor.java
index db84c8f..edc9703 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/contributions/OpenAntTaskImplementationListenerContributor.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/contributions/OpenAntTaskImplementationListenerContributor.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/contributions/OpenAntTaskImplementationMenuContributor.java b/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/contributions/OpenAntTaskImplementationMenuContributor.java
index 75cd370..b4c4227 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/contributions/OpenAntTaskImplementationMenuContributor.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/contributions/OpenAntTaskImplementationMenuContributor.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/contributions/PlatformEditorInput.java b/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/contributions/PlatformEditorInput.java
index 17cfa4e..0518bb3 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/contributions/PlatformEditorInput.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/contributions/PlatformEditorInput.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/contributions/TaskAntEditorContributor.java b/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/contributions/TaskAntEditorContributor.java
index 8a3a91a..b72553b 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/contributions/TaskAntEditorContributor.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/contributions/TaskAntEditorContributor.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/messages.properties b/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/messages.properties
index f3e254c..3f3ea89 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/messages.properties
+++ b/portfolio/org.eclipse.egf.portfolio.task.ant.ui/src/org/eclipse/egf/portfolio/task/ant/ui/messages.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.ant/build.properties b/portfolio/org.eclipse.egf.portfolio.task.ant/build.properties
index 89ec9e6..2621de7 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.ant/build.properties
+++ b/portfolio/org.eclipse.egf.portfolio.task.ant/build.properties
@@ -1,9 +1,12 @@
 ##
 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

+#  which accompanies this distribution, and is available at

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 
 #  Contributors:
 #      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.task.ant/plugin.properties b/portfolio/org.eclipse.egf.portfolio.task.ant/plugin.properties
index 6af788a..43fb90a 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.ant/plugin.properties
+++ b/portfolio/org.eclipse.egf.portfolio.task.ant/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/Activator.java b/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/Activator.java
index 61c9abd..5e17e19 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/Activator.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/Activator.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/Messages.java b/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/Messages.java
index 79dad58..12e4d59 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/Messages.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/Messages.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/engine/AntProject.java b/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/engine/AntProject.java
index 0b6a3af..50ea363 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/engine/AntProject.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/engine/AntProject.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/engine/AntScriptEngine.java b/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/engine/AntScriptEngine.java
index 0edd970..f897744 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/engine/AntScriptEngine.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/engine/AntScriptEngine.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/engine/AntTaskBuildLogger.java b/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/engine/AntTaskBuildLogger.java
index eab47c6..9c9c2b8 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/engine/AntTaskBuildLogger.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/engine/AntTaskBuildLogger.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/engine/DataConvert.java b/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/engine/DataConvert.java
index 8df6f7d..09a4b3b 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/engine/DataConvert.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/engine/DataConvert.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/engine/TaskNatureAnt.java b/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/engine/TaskNatureAnt.java
index 8806f83..3e29cd0 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/engine/TaskNatureAnt.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/engine/TaskNatureAnt.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/engine/TaskProductionForAnt.java b/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/engine/TaskProductionForAnt.java
index 4c6c3c0..f1328a8 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/engine/TaskProductionForAnt.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/engine/TaskProductionForAnt.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/messages.properties b/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/messages.properties
index 025d657..b160985 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/messages.properties
+++ b/portfolio/org.eclipse.egf.portfolio.task.ant/src/org/eclipse/egf/portfolio/task/ant/messages.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.atl.ui/build.properties b/portfolio/org.eclipse.egf.portfolio.task.atl.ui/build.properties
index 071dfb6..fa277bf 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.atl.ui/build.properties
+++ b/portfolio/org.eclipse.egf.portfolio.task.atl.ui/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2011 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.atl.ui/plugin.properties b/portfolio/org.eclipse.egf.portfolio.task.atl.ui/plugin.properties
index 56005b4..c8daf23 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.atl.ui/plugin.properties
+++ b/portfolio/org.eclipse.egf.portfolio.task.atl.ui/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.atl.ui/plugin.xml b/portfolio/org.eclipse.egf.portfolio.task.atl.ui/plugin.xml
index 2791e1d..ee7ff60 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.atl.ui/plugin.xml
+++ b/portfolio/org.eclipse.egf.portfolio.task.atl.ui/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.4"?>

 <!--

      Copyright (c) 2009-2011 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.atl.ui/src/org/eclipse/egf/portfolio/task/atl/ui/Messages.java b/portfolio/org.eclipse.egf.portfolio.task.atl.ui/src/org/eclipse/egf/portfolio/task/atl/ui/Messages.java
index 1b02af1..b8a9741 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.atl.ui/src/org/eclipse/egf/portfolio/task/atl/ui/Messages.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.atl.ui/src/org/eclipse/egf/portfolio/task/atl/ui/Messages.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.task.atl.ui/src/org/eclipse/egf/portfolio/task/atl/ui/contributions/AtlTaskEditorContributor.java b/portfolio/org.eclipse.egf.portfolio.task.atl.ui/src/org/eclipse/egf/portfolio/task/atl/ui/contributions/AtlTaskEditorContributor.java
index c010a31..9591737 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.atl.ui/src/org/eclipse/egf/portfolio/task/atl/ui/contributions/AtlTaskEditorContributor.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.atl.ui/src/org/eclipse/egf/portfolio/task/atl/ui/contributions/AtlTaskEditorContributor.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2011 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.atl.ui/src/org/eclipse/egf/portfolio/task/atl/ui/messages.properties b/portfolio/org.eclipse.egf.portfolio.task.atl.ui/src/org/eclipse/egf/portfolio/task/atl/ui/messages.properties
index f98d3e8..9c47300 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.atl.ui/src/org/eclipse/egf/portfolio/task/atl/ui/messages.properties
+++ b/portfolio/org.eclipse.egf.portfolio.task.atl.ui/src/org/eclipse/egf/portfolio/task/atl/ui/messages.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2011 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.atl/build.properties b/portfolio/org.eclipse.egf.portfolio.task.atl/build.properties
index 071dfb6..fa277bf 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.atl/build.properties
+++ b/portfolio/org.eclipse.egf.portfolio.task.atl/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2011 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.atl/plugin.properties b/portfolio/org.eclipse.egf.portfolio.task.atl/plugin.properties
index 3663b30..eff831e 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.atl/plugin.properties
+++ b/portfolio/org.eclipse.egf.portfolio.task.atl/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2011 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.atl/plugin.xml b/portfolio/org.eclipse.egf.portfolio.task.atl/plugin.xml
index 679f2ce..83b6f73 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.atl/plugin.xml
+++ b/portfolio/org.eclipse.egf.portfolio.task.atl/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.4"?>

 <!--

      Copyright (c) 2009-2011 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.atl/src/org/eclipse/egf/portfolio/task/atl/Messages.java b/portfolio/org.eclipse.egf.portfolio.task.atl/src/org/eclipse/egf/portfolio/task/atl/Messages.java
index 6252521..507c9ec 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.atl/src/org/eclipse/egf/portfolio/task/atl/Messages.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.atl/src/org/eclipse/egf/portfolio/task/atl/Messages.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2011 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.task.atl/src/org/eclipse/egf/portfolio/task/atl/engine/AtlScriptEngine.java b/portfolio/org.eclipse.egf.portfolio.task.atl/src/org/eclipse/egf/portfolio/task/atl/engine/AtlScriptEngine.java
index 5e7f19c..880a481 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.atl/src/org/eclipse/egf/portfolio/task/atl/engine/AtlScriptEngine.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.atl/src/org/eclipse/egf/portfolio/task/atl/engine/AtlScriptEngine.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2011 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.atl/src/org/eclipse/egf/portfolio/task/atl/engine/AtlTaskNature.java b/portfolio/org.eclipse.egf.portfolio.task.atl/src/org/eclipse/egf/portfolio/task/atl/engine/AtlTaskNature.java
index be9de4e..2a361a9 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.atl/src/org/eclipse/egf/portfolio/task/atl/engine/AtlTaskNature.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.atl/src/org/eclipse/egf/portfolio/task/atl/engine/AtlTaskNature.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2011 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.atl/src/org/eclipse/egf/portfolio/task/atl/messages.properties b/portfolio/org.eclipse.egf.portfolio.task.atl/src/org/eclipse/egf/portfolio/task/atl/messages.properties
index 6165dac..7ffe48b 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.atl/src/org/eclipse/egf/portfolio/task/atl/messages.properties
+++ b/portfolio/org.eclipse.egf.portfolio.task.atl/src/org/eclipse/egf/portfolio/task/atl/messages.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2011 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.jet.ui/build.properties b/portfolio/org.eclipse.egf.portfolio.task.jet.ui/build.properties
index 922a298..cc5246e 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.jet.ui/build.properties
+++ b/portfolio/org.eclipse.egf.portfolio.task.jet.ui/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009, 2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.jet.ui/plugin.properties b/portfolio/org.eclipse.egf.portfolio.task.jet.ui/plugin.properties
index df4012d..809d2d6 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.jet.ui/plugin.properties
+++ b/portfolio/org.eclipse.egf.portfolio.task.jet.ui/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.jet.ui/src/org/eclipse/egf/portfolio/task/jet/ui/Activator.java b/portfolio/org.eclipse.egf.portfolio.task.jet.ui/src/org/eclipse/egf/portfolio/task/jet/ui/Activator.java
index 0ae48c4..162a256 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.jet.ui/src/org/eclipse/egf/portfolio/task/jet/ui/Activator.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.jet.ui/src/org/eclipse/egf/portfolio/task/jet/ui/Activator.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2011 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.jet.ui/src/org/eclipse/egf/portfolio/task/jet/ui/Messages.java b/portfolio/org.eclipse.egf.portfolio.task.jet.ui/src/org/eclipse/egf/portfolio/task/jet/ui/Messages.java
index a708955..ee2405d 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.jet.ui/src/org/eclipse/egf/portfolio/task/jet/ui/Messages.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.jet.ui/src/org/eclipse/egf/portfolio/task/jet/ui/Messages.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009-2011 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/portfolio/org.eclipse.egf.portfolio.task.jet.ui/src/org/eclipse/egf/portfolio/task/jet/ui/contributions/JetTaskEditorContributor.java b/portfolio/org.eclipse.egf.portfolio.task.jet.ui/src/org/eclipse/egf/portfolio/task/jet/ui/contributions/JetTaskEditorContributor.java
index 505a8dd..5418cb7 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.jet.ui/src/org/eclipse/egf/portfolio/task/jet/ui/contributions/JetTaskEditorContributor.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.jet.ui/src/org/eclipse/egf/portfolio/task/jet/ui/contributions/JetTaskEditorContributor.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2011 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.jet.ui/src/org/eclipse/egf/portfolio/task/jet/ui/messages.properties b/portfolio/org.eclipse.egf.portfolio.task.jet.ui/src/org/eclipse/egf/portfolio/task/jet/ui/messages.properties
index 317a731..f6acad7 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.jet.ui/src/org/eclipse/egf/portfolio/task/jet/ui/messages.properties
+++ b/portfolio/org.eclipse.egf.portfolio.task.jet.ui/src/org/eclipse/egf/portfolio/task/jet/ui/messages.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2011 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.jet/build.properties b/portfolio/org.eclipse.egf.portfolio.task.jet/build.properties
index 922a298..cc5246e 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.jet/build.properties
+++ b/portfolio/org.eclipse.egf.portfolio.task.jet/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009, 2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.jet/plugin.properties b/portfolio/org.eclipse.egf.portfolio.task.jet/plugin.properties
index 3695deb..d9dae9b 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.jet/plugin.properties
+++ b/portfolio/org.eclipse.egf.portfolio.task.jet/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.jet/src/org/eclipse/egf/portfolio/task/jet/Activator.java b/portfolio/org.eclipse.egf.portfolio.task.jet/src/org/eclipse/egf/portfolio/task/jet/Activator.java
index d6a161f..4c45f5a 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.jet/src/org/eclipse/egf/portfolio/task/jet/Activator.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.jet/src/org/eclipse/egf/portfolio/task/jet/Activator.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2011 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.task.jet/src/org/eclipse/egf/portfolio/task/jet/engine/JetTaskNature.java b/portfolio/org.eclipse.egf.portfolio.task.jet/src/org/eclipse/egf/portfolio/task/jet/engine/JetTaskNature.java
index e36c33d..c4bbee9 100644
--- a/portfolio/org.eclipse.egf.portfolio.task.jet/src/org/eclipse/egf/portfolio/task/jet/engine/JetTaskNature.java
+++ b/portfolio/org.eclipse.egf.portfolio.task.jet/src/org/eclipse/egf/portfolio/task/jet/engine/JetTaskNature.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2011 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.type/build.properties b/portfolio/org.eclipse.egf.portfolio.type/build.properties
index 409ea5e..b4c4855 100644
--- a/portfolio/org.eclipse.egf.portfolio.type/build.properties
+++ b/portfolio/org.eclipse.egf.portfolio.type/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.type/plugin.properties b/portfolio/org.eclipse.egf.portfolio.type/plugin.properties
index 75609cf..b55a8f3 100644
--- a/portfolio/org.eclipse.egf.portfolio.type/plugin.properties
+++ b/portfolio/org.eclipse.egf.portfolio.type/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.type/plugin.xml b/portfolio/org.eclipse.egf.portfolio.type/plugin.xml
index 8785ae7..844727e 100644
--- a/portfolio/org.eclipse.egf.portfolio.type/plugin.xml
+++ b/portfolio/org.eclipse.egf.portfolio.type/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.type/src/org/eclipse/egf/portfolio/type/StringReplaceTask.java b/portfolio/org.eclipse.egf.portfolio.type/src/org/eclipse/egf/portfolio/type/StringReplaceTask.java
index 5b20d0e..3b052ed 100644
--- a/portfolio/org.eclipse.egf.portfolio.type/src/org/eclipse/egf/portfolio/type/StringReplaceTask.java
+++ b/portfolio/org.eclipse.egf.portfolio.type/src/org/eclipse/egf/portfolio/type/StringReplaceTask.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/org.eclipse.egf.portfolio.type/src/org/eclipse/egf/portfolio/type/TypeConstants.java b/portfolio/org.eclipse.egf.portfolio.type/src/org/eclipse/egf/portfolio/type/TypeConstants.java
index c2292ad..c40b027 100644
--- a/portfolio/org.eclipse.egf.portfolio.type/src/org/eclipse/egf/portfolio/type/TypeConstants.java
+++ b/portfolio/org.eclipse.egf.portfolio.type/src/org/eclipse/egf/portfolio/type/TypeConstants.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/portfolio/pom.xml b/portfolio/pom.xml
index 09c51e5..c179869 100644
--- a/portfolio/pom.xml
+++ b/portfolio/pom.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2018 THALES GLOBAL SERVICES.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
   which accompanies this distribution, and is available at
-  http://www.eclipse.org/legal/epl-v10.html
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 
   Contributors:
        Thales - initial API and implementation
diff --git a/releng/org.eclipse.egf.core.updatesite/category.xml b/releng/org.eclipse.egf.core.updatesite/category.xml
index 4ff98f7..398f659 100644
--- a/releng/org.eclipse.egf.core.updatesite/category.xml
+++ b/releng/org.eclipse.egf.core.updatesite/category.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

diff --git a/releng/org.eclipse.egf.core.updatesite/pom.xml b/releng/org.eclipse.egf.core.updatesite/pom.xml
index 3fa91a4..3473e9a 100644
--- a/releng/org.eclipse.egf.core.updatesite/pom.xml
+++ b/releng/org.eclipse.egf.core.updatesite/pom.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2018 THALES GLOBAL SERVICES.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
   which accompanies this distribution, and is available at
-  http://www.eclipse.org/legal/epl-v10.html
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 
   Contributors:
        Thales - initial API and implementation
diff --git a/releng/org.eclipse.egf.product/build.properties b/releng/org.eclipse.egf.product/build.properties
index 5420be4..830b7f3 100644
--- a/releng/org.eclipse.egf.product/build.properties
+++ b/releng/org.eclipse.egf.product/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/releng/org.eclipse.egf.product/plugin.properties b/releng/org.eclipse.egf.product/plugin.properties
index c5cd354..df2ed63 100644
--- a/releng/org.eclipse.egf.product/plugin.properties
+++ b/releng/org.eclipse.egf.product/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2018 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/releng/org.eclipse.egf.product/pom.xml b/releng/org.eclipse.egf.product/pom.xml
index 3be532c..a111c39 100644
--- a/releng/org.eclipse.egf.product/pom.xml
+++ b/releng/org.eclipse.egf.product/pom.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

   Copyright (c) 2018 THALES GLOBAL SERVICES.

-  All rights reserved. This program and the accompanying materials

-  are made available under the terms of the Eclipse Public License v1.0

-  which accompanies this distribution, and is available at

-  http://www.eclipse.org/legal/epl-v10.html

+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 

   Contributors:

        Thales - initial API and implementation

diff --git a/releng/org.eclipse.egf.releng/build.properties b/releng/org.eclipse.egf.releng/build.properties
index e46478b..788e581 100644
--- a/releng/org.eclipse.egf.releng/build.properties
+++ b/releng/org.eclipse.egf.releng/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/releng/org.eclipse.egf.releng2/plugin.properties b/releng/org.eclipse.egf.releng2/plugin.properties
index c0354d4..4111644 100644
--- a/releng/org.eclipse.egf.releng2/plugin.properties
+++ b/releng/org.eclipse.egf.releng2/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/releng/org.eclipse.egf.releng2/src/org/eclipse/egf/releng2/PublishExamplesTask.java b/releng/org.eclipse.egf.releng2/src/org/eclipse/egf/releng2/PublishExamplesTask.java
index 00d02bf..2bafc54 100644
--- a/releng/org.eclipse.egf.releng2/src/org/eclipse/egf/releng2/PublishExamplesTask.java
+++ b/releng/org.eclipse.egf.releng2/src/org/eclipse/egf/releng2/PublishExamplesTask.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/releng/org.eclipse.egf.targets/pom.xml b/releng/org.eclipse.egf.targets/pom.xml
index 70d167d..4937a0e 100644
--- a/releng/org.eclipse.egf.targets/pom.xml
+++ b/releng/org.eclipse.egf.targets/pom.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2018 THALES GLOBAL SERVICES.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
   which accompanies this distribution, and is available at
-  http://www.eclipse.org/legal/epl-v10.html
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 
   Contributors:
        Thales - initial API and implementation
diff --git a/tests/org.eclipse.egf.core.test.model.edit/build.properties b/tests/org.eclipse.egf.core.test.model.edit/build.properties
index b3ea932..81c490f 100644
--- a/tests/org.eclipse.egf.core.test.model.edit/build.properties
+++ b/tests/org.eclipse.egf.core.test.model.edit/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test.model.editor/build.properties b/tests/org.eclipse.egf.core.test.model.editor/build.properties
index b3ea932..81c490f 100644
--- a/tests/org.eclipse.egf.core.test.model.editor/build.properties
+++ b/tests/org.eclipse.egf.core.test.model.editor/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test.model/build.properties b/tests/org.eclipse.egf.core.test.model/build.properties
index 659b827..9736c54 100644
--- a/tests/org.eclipse.egf.core.test.model/build.properties
+++ b/tests/org.eclipse.egf.core.test.model/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test.pattern/build.properties b/tests/org.eclipse.egf.core.test.pattern/build.properties
index be467e3..a47aef0 100644
--- a/tests/org.eclipse.egf.core.test.pattern/build.properties
+++ b/tests/org.eclipse.egf.core.test.pattern/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test.pattern/plugin.properties b/tests/org.eclipse.egf.core.test.pattern/plugin.properties
index 9b9c879..604d152 100644
--- a/tests/org.eclipse.egf.core.test.pattern/plugin.properties
+++ b/tests/org.eclipse.egf.core.test.pattern/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/build.properties b/tests/org.eclipse.egf.core.test/build.properties
index 9a98f79..a63cbb1 100644
--- a/tests/org.eclipse.egf.core.test/build.properties
+++ b/tests/org.eclipse.egf.core.test/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2019 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/plugin.properties b/tests/org.eclipse.egf.core.test/plugin.properties
index f892f10..b80018c 100644
--- a/tests/org.eclipse.egf.core.test/plugin.properties
+++ b/tests/org.eclipse.egf.core.test/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/plugin.properties b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/plugin.properties
index 0d3a798..02995f6 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/plugin.properties
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.task.h2/plugin.properties b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.task.h2/plugin.properties
index 6d89623..db093d0 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.task.h2/plugin.properties
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.task.h2/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.task.h3/plugin.properties b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.task.h3/plugin.properties
index 62a4f56..c954812 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.task.h3/plugin.properties
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.task.h3/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.task.h4/build.properties b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.task.h4/build.properties
index 4d6a126..2e51c5f 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.task.h4/build.properties
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.task.h4/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.task.h4/plugin.properties b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.task.h4/plugin.properties
index 076dc20..02218db 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.task.h4/plugin.properties
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.task.h4/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.task.h4/src/org/eclipse/egf/example/task/h4/Activator.java b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.task.h4/src/org/eclipse/egf/example/task/h4/Activator.java
index 58bd393..af3c44c 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.task.h4/src/org/eclipse/egf/example/task/h4/Activator.java
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.task.h4/src/org/eclipse/egf/example/task/h4/Activator.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2015 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.task.h4/src/org/eclipse/egf/example/task/h4/H4.java b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.task.h4/src/org/eclipse/egf/example/task/h4/H4.java
index fc5f043..d912aa3 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.task.h4/src/org/eclipse/egf/example/task/h4/H4.java
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.task.h4/src/org/eclipse/egf/example/task/h4/H4.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2015 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/build.properties b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/build.properties
index 43b07eb..e9dac85 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/build.properties
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/build.properties
@@ -1,10 +1,13 @@
 

 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/plugin.properties b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/plugin.properties
index 1ef092f..0c072a8 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/plugin.properties
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/HelloWorld.java b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/HelloWorld.java
index 8b52925..52f49a2 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/HelloWorld.java
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/HelloWorld.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/callback/MyCallbackHandler.java b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/callback/MyCallbackHandler.java
index 9361014..fd7c816 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/callback/MyCallbackHandler.java
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/callback/MyCallbackHandler.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2009 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/helper/MyHelper.java b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/helper/MyHelper.java
index 71476b2..1b8dcd7 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/helper/MyHelper.java
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/helper/MyHelper.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/query/ContentQuery.java b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/query/ContentQuery.java
index 4c3cf4d..95cefa30 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/query/ContentQuery.java
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/query/ContentQuery.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/reporter/MyReporter.java b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/reporter/MyReporter.java
index 43b80d2..e6b9028 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/reporter/MyReporter.java
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/src/org/eclipse/egf/usecase/pattern/uc1/reporter/MyReporter.java
@@ -2,10 +2,12 @@
  * <copyright>
  * 
  * Copyright (c) 2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/tests/org.eclipse.egf.core.test/src/org/eclipse/egf/core/test/EGFCoreTestPlugin.java b/tests/org.eclipse.egf.core.test/src/org/eclipse/egf/core/test/EGFCoreTestPlugin.java
index 32c3317..4f3605a 100644
--- a/tests/org.eclipse.egf.core.test/src/org/eclipse/egf/core/test/EGFCoreTestPlugin.java
+++ b/tests/org.eclipse.egf.core.test/src/org/eclipse/egf/core/test/EGFCoreTestPlugin.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/AllTests.java b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/AllTests.java
index 3c464d9..7aec0fa 100644
--- a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/AllTests.java
+++ b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/AllTests.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v2.0.

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 
  * Contributors:
  * Thales Corporate Services S.A.S - initial API and implementation
diff --git a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/FilteredFileSystemStructureProvider.java b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/FilteredFileSystemStructureProvider.java
index e16d528..64d188a 100644
--- a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/FilteredFileSystemStructureProvider.java
+++ b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/FilteredFileSystemStructureProvider.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/ModelTestCase.java b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/ModelTestCase.java
index 8b91ea6..639285e 100644
--- a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/ModelTestCase.java
+++ b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/ModelTestCase.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/ModelTestHelper.java b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/ModelTestHelper.java
index 5c0a548..ec0ec34 100644
--- a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/ModelTestHelper.java
+++ b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/ModelTestHelper.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/WorkspaceInitializationTest.java b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/WorkspaceInitializationTest.java
index f4aa02f..0b98676 100644
--- a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/WorkspaceInitializationTest.java
+++ b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/WorkspaceInitializationTest.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/factorycomponent/ContextFactoryComponent.java b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/factorycomponent/ContextFactoryComponent.java
index 540cf15..9d2fb0d 100644
--- a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/factorycomponent/ContextFactoryComponent.java
+++ b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/factorycomponent/ContextFactoryComponent.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/factorycomponent/memory/ContextFactoryComponentMemory.java b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/factorycomponent/memory/ContextFactoryComponentMemory.java
index 9549cee..7e566e8 100644
--- a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/factorycomponent/memory/ContextFactoryComponentMemory.java
+++ b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/factorycomponent/memory/ContextFactoryComponentMemory.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/factorycomponent/resource/ContextFactoryComponentResource.java b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/factorycomponent/resource/ContextFactoryComponentResource.java
index a5a648b..2e8ec98 100644
--- a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/factorycomponent/resource/ContextFactoryComponentResource.java
+++ b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/factorycomponent/resource/ContextFactoryComponentResource.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/loader/ContextLoader.java b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/loader/ContextLoader.java
index 623c073..1dbcdb0 100644
--- a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/loader/ContextLoader.java
+++ b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/loader/ContextLoader.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/loader/platform/ContextLoaderTargetBundle.java b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/loader/platform/ContextLoaderTargetBundle.java
index 88dffbd..f0cbe61 100644
--- a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/loader/platform/ContextLoaderTargetBundle.java
+++ b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/loader/platform/ContextLoaderTargetBundle.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/loader/platform/ContextLoaderWorkspaceBundle.java b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/loader/platform/ContextLoaderWorkspaceBundle.java
index 6cbe081..7ee3452 100644
--- a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/loader/platform/ContextLoaderWorkspaceBundle.java
+++ b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/loader/platform/ContextLoaderWorkspaceBundle.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/model/validation/ModelValidation.java b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/model/validation/ModelValidation.java
index c6d5459..1276fb2 100644
--- a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/model/validation/ModelValidation.java
+++ b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/model/validation/ModelValidation.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/model/validation/fprod/FprodContractValidation.java b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/model/validation/fprod/FprodContractValidation.java
index 5f9a201..092c6bb 100644
--- a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/model/validation/fprod/FprodContractValidation.java
+++ b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/model/validation/fprod/FprodContractValidation.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/resourceset/ResourceSetTests.java b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/resourceset/ResourceSetTests.java
index 855631e..ad59dc8 100644
--- a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/resourceset/ResourceSetTests.java
+++ b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/resourceset/ResourceSetTests.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2015 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/task/ContextTask.java b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/task/ContextTask.java
index 87383e8..1c3bc5f 100644
--- a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/task/ContextTask.java
+++ b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/task/ContextTask.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/task/memory/ContextTaskMemory.java b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/task/memory/ContextTaskMemory.java
index 705d67d..4dafa13 100644
--- a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/task/memory/ContextTaskMemory.java
+++ b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/task/memory/ContextTaskMemory.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/task/memory/Task.java b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/task/memory/Task.java
index 6d698d3..5b5a448 100644
--- a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/task/memory/Task.java
+++ b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/task/memory/Task.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2015 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/task/resource/ContextTaskResource.java b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/task/resource/ContextTaskResource.java
index 5939914..04ee8d3 100644
--- a/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/task/resource/ContextTaskResource.java
+++ b/tests/org.eclipse.egf.core.test/test/org/eclipse/egf/core/test/task/resource/ContextTaskResource.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.portfolio.task.ant.test/build.properties b/tests/org.eclipse.egf.portfolio.task.ant.test/build.properties
index 787cd39..1c85de7 100644
--- a/tests/org.eclipse.egf.portfolio.task.ant.test/build.properties
+++ b/tests/org.eclipse.egf.portfolio.task.ant.test/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.portfolio.task.ant.test/plugin.properties b/tests/org.eclipse.egf.portfolio.task.ant.test/plugin.properties
index 44e725d..e4823f6 100644
--- a/tests/org.eclipse.egf.portfolio.task.ant.test/plugin.properties
+++ b/tests/org.eclipse.egf.portfolio.task.ant.test/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.portfolio.task.ant.test/src/org/eclipse/egf/portfolio/task/ant/test/AllTests.java b/tests/org.eclipse.egf.portfolio.task.ant.test/src/org/eclipse/egf/portfolio/task/ant/test/AllTests.java
index f273141..7f8b6d4 100644
--- a/tests/org.eclipse.egf.portfolio.task.ant.test/src/org/eclipse/egf/portfolio/task/ant/test/AllTests.java
+++ b/tests/org.eclipse.egf.portfolio.task.ant.test/src/org/eclipse/egf/portfolio/task/ant/test/AllTests.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.portfolio.task.ant.test/src/org/eclipse/egf/portfolio/task/ant/test/AntTestCase.java b/tests/org.eclipse.egf.portfolio.task.ant.test/src/org/eclipse/egf/portfolio/task/ant/test/AntTestCase.java
index a9f6075..6ae3000 100644
--- a/tests/org.eclipse.egf.portfolio.task.ant.test/src/org/eclipse/egf/portfolio/task/ant/test/AntTestCase.java
+++ b/tests/org.eclipse.egf.portfolio.task.ant.test/src/org/eclipse/egf/portfolio/task/ant/test/AntTestCase.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/org.eclipse.egf.portfolio.task.ant.test/src/org/eclipse/egf/portfolio/task/ant/test/task/WriteAndReadContractInTask.java b/tests/org.eclipse.egf.portfolio.task.ant.test/src/org/eclipse/egf/portfolio/task/ant/test/task/WriteAndReadContractInTask.java
index 138125a..311e874 100644
--- a/tests/org.eclipse.egf.portfolio.task.ant.test/src/org/eclipse/egf/portfolio/task/ant/test/task/WriteAndReadContractInTask.java
+++ b/tests/org.eclipse.egf.portfolio.task.ant.test/src/org/eclipse/egf/portfolio/task/ant/test/task/WriteAndReadContractInTask.java
@@ -2,10 +2,12 @@
  * <copyright>

  * 

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tests/pom.xml b/tests/pom.xml
index f80b06c..b7ffb07 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2018 THALES GLOBAL SERVICES.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
+  This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v2.0
   which accompanies this distribution, and is available at
-  http://www.eclipse.org/legal/epl-v10.html
+  https://www.eclipse.org/legal/epl-2.0

+

+  SPDX-License-Identifier: EPL-2.0

 
   Contributors:
        Thales - initial API and implementation
diff --git a/tools/org.eclipse.egf.emf.pattern.codegen.ui/build.properties b/tools/org.eclipse.egf.emf.pattern.codegen.ui/build.properties
index 250c389..eb580a4 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen.ui/build.properties
+++ b/tools/org.eclipse.egf.emf.pattern.codegen.ui/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen.ui/plugin.properties b/tools/org.eclipse.egf.emf.pattern.codegen.ui/plugin.properties
index c03b140..d9f1019 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen.ui/plugin.properties
+++ b/tools/org.eclipse.egf.emf.pattern.codegen.ui/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen.ui/plugin.xml b/tools/org.eclipse.egf.emf.pattern.codegen.ui/plugin.xml
index c9590b9..f22b2e7 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen.ui/plugin.xml
+++ b/tools/org.eclipse.egf.emf.pattern.codegen.ui/plugin.xml
@@ -2,10 +2,12 @@
 <?eclipse version="3.2"?>

 <!--

      Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-     All rights reserved. This program and the accompanying materials

-     are made available under the terms of the Eclipse Public License v1.0

+     This program and the accompanying materials

+     are made available under the terms of the Eclipse Public License v2.0

      which accompanies this distribution, and is available at

-     http://www.eclipse.org/legal/epl-v10.html

+     https://www.eclipse.org/legal/epl-2.0

+

+     SPDX-License-Identifier: EPL-2.0

     

      Contributors:

          Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen.ui/src/org/eclipse/egf/emf/pattern/codegen/ui/Activator.java b/tools/org.eclipse.egf.emf.pattern.codegen.ui/src/org/eclipse/egf/emf/pattern/codegen/ui/Activator.java
index d4b0130..0c723f5 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen.ui/src/org/eclipse/egf/emf/pattern/codegen/ui/Activator.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen.ui/src/org/eclipse/egf/emf/pattern/codegen/ui/Activator.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen.ui/src/org/eclipse/egf/emf/pattern/codegen/ui/ReverseCodegenAction.java b/tools/org.eclipse.egf.emf.pattern.codegen.ui/src/org/eclipse/egf/emf/pattern/codegen/ui/ReverseCodegenAction.java
index 18c43b9..68d8ec5 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen.ui/src/org/eclipse/egf/emf/pattern/codegen/ui/ReverseCodegenAction.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen.ui/src/org/eclipse/egf/emf/pattern/codegen/ui/ReverseCodegenAction.java
@@ -1,9 +1,11 @@
 /**

  * Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-v2.0

+ *

+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  * Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen.ui/src/org/eclipse/egf/emf/pattern/codegen/ui/messages.properties b/tools/org.eclipse.egf.emf.pattern.codegen.ui/src/org/eclipse/egf/emf/pattern/codegen/ui/messages.properties
index 47edcff..eac057b 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen.ui/src/org/eclipse/egf/emf/pattern/codegen/ui/messages.properties
+++ b/tools/org.eclipse.egf.emf.pattern.codegen.ui/src/org/eclipse/egf/emf/pattern/codegen/ui/messages.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/build.properties b/tools/org.eclipse.egf.emf.pattern.codegen/build.properties
index 4d7caf9..6563676 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/build.properties
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/build.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/plugin.properties b/tools/org.eclipse.egf.emf.pattern.codegen/plugin.properties
index 4ec43b4..95aa2dc 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/plugin.properties
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/plugin.properties
@@ -1,9 +1,12 @@
 ##

 #  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

+#

+#  This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License 2.0

 #  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

+#  https://www.eclipse.org/legal/epl-2.0

+#

+#  SPDX-License-Identifier: EPL-2.0

 # 

 #  Contributors:

 #      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/CodegenJetCompilerLF1.java b/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/CodegenJetCompilerLF1.java
index 5c044e3..8d25798 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/CodegenJetCompilerLF1.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/CodegenJetCompilerLF1.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/CodegenJetCompilerLF2.java b/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/CodegenJetCompilerLF2.java
index 4108d25..d2e0c60 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/CodegenJetCompilerLF2.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/CodegenJetCompilerLF2.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/CodegenJetCompilerTestCase.java b/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/CodegenJetCompilerTestCase.java
index 76a93cd..99b197d 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/CodegenJetCompilerTestCase.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/CodegenJetCompilerTestCase.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/CodegenJetParser.java b/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/CodegenJetParser.java
index 44df3c9..b67c8c5 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/CodegenJetParser.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/CodegenJetParser.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/Mark.java b/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/Mark.java
index 8f23cc4..be436cd 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/Mark.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/Mark.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/PrintVisitor.java b/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/PrintVisitor.java
index 2bb6e7d..b90f317 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/PrintVisitor.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/PrintVisitor.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/Section.java b/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/Section.java
index 7e837a5..a7babcf 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/Section.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/Section.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/StructureVisitor.java b/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/StructureVisitor.java
index f8e8a4e..a4a17f8 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/StructureVisitor.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/StructureVisitor.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/Test.java b/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/Test.java
index 0efd887..82f08b6 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/Test.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/sandbox/parsejet/test2/Test.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

@@ -89,10 +91,12 @@
          * <copyright>

          *

          * 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

+         * This program and the accompanying materials

+         * are made available under the terms of the Eclipse Public License v2.0

          * which accompanies this distribution, and is available at

-         * http://www.eclipse.org/legal/epl-v10.html

+         * https://www.eclipse.org/legal/epl-2.0

+         *

+         * SPDX-License-Identifier: EPL-2.0

          *

          * Contributors:

          *   IBM - Initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenEGFHelper.java b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenEGFHelper.java
index 3801d38..0ab05a8 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenEGFHelper.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenEGFHelper.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenEngine.java b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenEngine.java
index e47bd6e..d8e7183 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenEngine.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenEngine.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009, 2018 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenFcoreUtil.java b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenFcoreUtil.java
index b941f8a..cf6b9cd 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenFcoreUtil.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenFcoreUtil.java
@@ -2,10 +2,12 @@
  * <copyright>
  *
  *  Copyright (c) 2009-2016 Thales Corporate Services S.A.S.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-v2.0.

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 
  *  Contributors:
  *      Thales Corporate Services S.A.S - initial API and implementation
diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenPatternDescriptionHandler.java b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenPatternDescriptionHandler.java
index 6161990..74a667d 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenPatternDescriptionHandler.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenPatternDescriptionHandler.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenPatternFactory.java b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenPatternFactory.java
index c22bf1d..d94a4c5 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenPatternFactory.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenPatternFactory.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenPatternHelper.java b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenPatternHelper.java
index c955451..3c70d42 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenPatternHelper.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenPatternHelper.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenPatternInitializer.java b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenPatternInitializer.java
index 3a41454..7e53a28 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenPatternInitializer.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenPatternInitializer.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenPatternMethodContentResolver.java b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenPatternMethodContentResolver.java
index 410cbd6..8fd191c 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenPatternMethodContentResolver.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenPatternMethodContentResolver.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenPatternNameResolver.java b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenPatternNameResolver.java
index 6eb1c0a..4a49554 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenPatternNameResolver.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenPatternNameResolver.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenVersionHelper.java b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenVersionHelper.java
index 48d5809..3bf506e 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenVersionHelper.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/CodegenVersionHelper.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jdt/CodegenASTHelper.java b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jdt/CodegenASTHelper.java
index ee3e11f..991bcef 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jdt/CodegenASTHelper.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jdt/CodegenASTHelper.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jdt/CodegenCompilationUnitHelper.java b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jdt/CodegenCompilationUnitHelper.java
index 9fc17f5..748cde3 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jdt/CodegenCompilationUnitHelper.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jdt/CodegenCompilationUnitHelper.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jet/CodegenJetCompiler.java b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jet/CodegenJetCompiler.java
index b1b052a..2eab200 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jet/CodegenJetCompiler.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jet/CodegenJetCompiler.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jet/CodegenJetConstants.java b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jet/CodegenJetConstants.java
index 0518759..f4318d6 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jet/CodegenJetConstants.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jet/CodegenJetConstants.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jet/CodegenJetPatternHelper.java b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jet/CodegenJetPatternHelper.java
index 281a870..75b390c 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jet/CodegenJetPatternHelper.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jet/CodegenJetPatternHelper.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jet/CodegenJetTemplateSection.java b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jet/CodegenJetTemplateSection.java
index 22e9580..f90d41b 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jet/CodegenJetTemplateSection.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jet/CodegenJetTemplateSection.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jet/CodegenJetVariablesResolver.java b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jet/CodegenJetVariablesResolver.java
index aea621c..368506d 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jet/CodegenJetVariablesResolver.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/jet/CodegenJetVariablesResolver.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/AbstractInfo.java b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/AbstractInfo.java
index 212e20a..35ae1b3 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/AbstractInfo.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/AbstractInfo.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/AbstractInfoComparator.java b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/AbstractInfoComparator.java
index 96ea039..67d3572 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/AbstractInfoComparator.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/AbstractInfoComparator.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/GIFPatternInfo.java b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/GIFPatternInfo.java
index 4ae8f6e..35d2d15 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/GIFPatternInfo.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/GIFPatternInfo.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/JetAbstractPatternInfo.java b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/JetAbstractPatternInfo.java
index 139f19e..fd7d0dd 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/JetAbstractPatternInfo.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/JetAbstractPatternInfo.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/JetPatternInfo.java b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/JetPatternInfo.java
index 589a214..269b13b 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/JetPatternInfo.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/JetPatternInfo.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/JetSubPatternInfo.java b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/JetSubPatternInfo.java
index 14149ba..81786b9 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/JetSubPatternInfo.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/JetSubPatternInfo.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/MethodInfo.java b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/MethodInfo.java
index c460866..a7af535 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/MethodInfo.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/MethodInfo.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/MethodInfoFactory.java b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/MethodInfoFactory.java
index 7dc6f03..e1ef496 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/MethodInfoFactory.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/MethodInfoFactory.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/PatternInfo.java b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/PatternInfo.java
index 66a4e52..6745560 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/PatternInfo.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/PatternInfo.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation

diff --git a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/VariableInfo.java b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/VariableInfo.java
index 3bff5d7..5e2d985 100644
--- a/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/VariableInfo.java
+++ b/tools/org.eclipse.egf.emf.pattern.codegen/src/org/eclipse/egf/emf/pattern/codegen/model/VariableInfo.java
@@ -2,10 +2,12 @@
  * <copyright>

  *

  *  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

+ *  This program and the accompanying materials

+ *  are made available under the terms of the Eclipse Public License v2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-v2.0

+ *

+ *  SPDX-License-Identifier: EPL-2.0

  * 

  *  Contributors:

  *      Thales Corporate Services S.A.S - initial API and implementation