[431255] New SUA applied to emf.license feature only

Change-Id: Ideea44c7bbdab01abdb1dda9ffe1283955a8a7ac
author: Dennis Huebner 2014-04-11 11:55:27 +0000
committer: Dennis Huebner 2014-04-24 14:19:17 +0000
commit: 7c92289d4e894d50aa0b7700b9341678320a60fb (patch)
tree: 2962cb5e0fd70bbd27622c383b8d9c38751e6fd1
parent: e6b4ca8244f00eadee5c684ec41f098959085b7b (diff)
download: org.eclipse.emf-7c92289d4e894d50aa0b7700b9341678320a60fb.tar.gz
org.eclipse.emf-7c92289d4e894d50aa0b7700b9341678320a60fb.tar.xz
org.eclipse.emf-7c92289d4e894d50aa0b7700b9341678320a60fb.zip
54 files changed, 552 insertions, 642 deletions
diff --git a/doc/org.eclipse.emf.doc-feature/feature.xml b/doc/org.eclipse.emf.doc-feature/feature.xml
index 8de10ebea..94ed7d6d2 100644
--- a/doc/org.eclipse.emf.doc-feature/feature.xml
+++ b/doc/org.eclipse.emf.doc-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.8.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/examples/org.eclipse.emf.examples-feature/feature.xml b/examples/org.eclipse.emf.examples-feature/feature.xml
index c1b243ccb..8c14bd153 100644
--- a/examples/org.eclipse.emf.examples-feature/feature.xml
+++ b/examples/org.eclipse.emf.examples-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.9.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf-feature/feature.xml b/features/org.eclipse.emf-feature/feature.xml
index 113c160a8..74f9c47d2 100644
--- a/features/org.eclipse.emf-feature/feature.xml
+++ b/features/org.eclipse.emf-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.10.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.all-feature/feature.xml b/features/org.eclipse.emf.all-feature/feature.xml
index 3c2457949..29f48dcc9 100644
--- a/features/org.eclipse.emf.all-feature/feature.xml
+++ b/features/org.eclipse.emf.all-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.10.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.base-feature/feature.xml b/features/org.eclipse.emf.base-feature/feature.xml
index ac83dec1f..95a18cc9a 100644
--- a/features/org.eclipse.emf.base-feature/feature.xml
+++ b/features/org.eclipse.emf.base-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.10.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.codegen-feature/feature.xml b/features/org.eclipse.emf.codegen-feature/feature.xml
index 6a404a3ea..e471efefa 100644
--- a/features/org.eclipse.emf.codegen-feature/feature.xml
+++ b/features/org.eclipse.emf.codegen-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.10.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.codegen.ecore-feature/feature.xml b/features/org.eclipse.emf.codegen.ecore-feature/feature.xml
index 309f8ddcb..bbc0da74f 100644
--- a/features/org.eclipse.emf.codegen.ecore-feature/feature.xml
+++ b/features/org.eclipse.emf.codegen.ecore-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.10.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.codegen.ecore.ui-feature/feature.xml b/features/org.eclipse.emf.codegen.ecore.ui-feature/feature.xml
index 73d8240e6..12cf555f4 100644
--- a/features/org.eclipse.emf.codegen.ecore.ui-feature/feature.xml
+++ b/features/org.eclipse.emf.codegen.ecore.ui-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.10.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.codegen.ui-feature/feature.xml b/features/org.eclipse.emf.codegen.ui-feature/feature.xml
index 29cea4d54..c4b476ab8 100644
--- a/features/org.eclipse.emf.codegen.ui-feature/feature.xml
+++ b/features/org.eclipse.emf.codegen.ui-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.7.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.common-feature/feature.xml b/features/org.eclipse.emf.common-feature/feature.xml
index aa1785209..0717cb890 100644
--- a/features/org.eclipse.emf.common-feature/feature.xml
+++ b/features/org.eclipse.emf.common-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.10.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.common.ui-feature/feature.xml b/features/org.eclipse.emf.common.ui-feature/feature.xml
index d0106fae1..82c40c7c2 100644
--- a/features/org.eclipse.emf.common.ui-feature/feature.xml
+++ b/features/org.eclipse.emf.common.ui-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.9.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.converter-feature/feature.xml b/features/org.eclipse.emf.converter-feature/feature.xml
index 7e2d8c7cf..de7e94a4c 100644
--- a/features/org.eclipse.emf.converter-feature/feature.xml
+++ b/features/org.eclipse.emf.converter-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.10.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.databinding-feature/feature.xml b/features/org.eclipse.emf.databinding-feature/feature.xml
index 5dcbf2efa..91c5e1ce7 100644
--- a/features/org.eclipse.emf.databinding-feature/feature.xml
+++ b/features/org.eclipse.emf.databinding-feature/feature.xml
@@ -5,7 +5,7 @@
       version="1.3.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.databinding.edit-feature/feature.xml b/features/org.eclipse.emf.databinding.edit-feature/feature.xml
index 65cf89422..9bebf8c77 100644
--- a/features/org.eclipse.emf.databinding.edit-feature/feature.xml
+++ b/features/org.eclipse.emf.databinding.edit-feature/feature.xml
@@ -5,7 +5,7 @@
       version="1.3.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecore-feature/feature.xml b/features/org.eclipse.emf.ecore-feature/feature.xml
index eca525614..8db78a618 100644
--- a/features/org.eclipse.emf.ecore-feature/feature.xml
+++ b/features/org.eclipse.emf.ecore-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.10.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecore.edit-feature/feature.xml b/features/org.eclipse.emf.ecore.edit-feature/feature.xml
index bea42c4c9..004d02289 100644
--- a/features/org.eclipse.emf.ecore.edit-feature/feature.xml
+++ b/features/org.eclipse.emf.ecore.edit-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.9.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecore.editor-feature/feature.xml b/features/org.eclipse.emf.ecore.editor-feature/feature.xml
index 331075865..53fabe4bf 100644
--- a/features/org.eclipse.emf.ecore.editor-feature/feature.xml
+++ b/features/org.eclipse.emf.ecore.editor-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.10.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecore.xcore-feature/feature.xml b/features/org.eclipse.emf.ecore.xcore-feature/feature.xml
index 332e1fe31..17e6a902e 100644
--- a/features/org.eclipse.emf.ecore.xcore-feature/feature.xml
+++ b/features/org.eclipse.emf.ecore.xcore-feature/feature.xml
@@ -5,7 +5,7 @@
       version="1.2.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecore.xcore.lib-feature/feature.xml b/features/org.eclipse.emf.ecore.xcore.lib-feature/feature.xml
index e02555f61..d2a948335 100644
--- a/features/org.eclipse.emf.ecore.xcore.lib-feature/feature.xml
+++ b/features/org.eclipse.emf.ecore.xcore.lib-feature/feature.xml
@@ -5,7 +5,7 @@
       version="1.2.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecore.xcore.sdk-feature/feature.xml b/features/org.eclipse.emf.ecore.xcore.sdk-feature/feature.xml
index a024cdc16..1cd3800be 100644
--- a/features/org.eclipse.emf.ecore.xcore.sdk-feature/feature.xml
+++ b/features/org.eclipse.emf.ecore.xcore.sdk-feature/feature.xml
@@ -5,7 +5,7 @@
       version="1.2.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecore.xcore.ui-feature/feature.xml b/features/org.eclipse.emf.ecore.xcore.ui-feature/feature.xml
index d0fdd3fc3..82fca0125 100644
--- a/features/org.eclipse.emf.ecore.xcore.ui-feature/feature.xml
+++ b/features/org.eclipse.emf.ecore.xcore.ui-feature/feature.xml
@@ -5,7 +5,7 @@
       version="1.2.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.edit-feature/feature.xml b/features/org.eclipse.emf.edit-feature/feature.xml
index 14ff1fb7e..68e3cbf92 100644
--- a/features/org.eclipse.emf.edit-feature/feature.xml
+++ b/features/org.eclipse.emf.edit-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.10.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.edit.ui-feature/feature.xml b/features/org.eclipse.emf.edit.ui-feature/feature.xml
index ad62cc200..f405b80da 100644
--- a/features/org.eclipse.emf.edit.ui-feature/feature.xml
+++ b/features/org.eclipse.emf.edit.ui-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.10.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.gwt-feature/feature.xml b/features/org.eclipse.emf.gwt-feature/feature.xml
index 1a163ac76..c4ff22d2b 100644
--- a/features/org.eclipse.emf.gwt-feature/feature.xml
+++ b/features/org.eclipse.emf.gwt-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.9.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.gwt.common-feature/feature.xml b/features/org.eclipse.emf.gwt.common-feature/feature.xml
index 0e4ec079e..09da34b48 100644
--- a/features/org.eclipse.emf.gwt.common-feature/feature.xml
+++ b/features/org.eclipse.emf.gwt.common-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.9.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.gwt.ecore-feature/feature.xml b/features/org.eclipse.emf.gwt.ecore-feature/feature.xml
index adc8a6d7b..781b43981 100644
--- a/features/org.eclipse.emf.gwt.ecore-feature/feature.xml
+++ b/features/org.eclipse.emf.gwt.ecore-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.9.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.gwt.ecore.edit-feature/feature.xml b/features/org.eclipse.emf.gwt.ecore.edit-feature/feature.xml
index 89b84824b..014d8e365 100644
--- a/features/org.eclipse.emf.gwt.ecore.edit-feature/feature.xml
+++ b/features/org.eclipse.emf.gwt.ecore.edit-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.8.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.gwt.edit-feature/feature.xml b/features/org.eclipse.emf.gwt.edit-feature/feature.xml
index 5db6d5b27..1bc06f7b7 100644
--- a/features/org.eclipse.emf.gwt.edit-feature/feature.xml
+++ b/features/org.eclipse.emf.gwt.edit-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.8.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.gwt.edit.ui-feature/feature.xml b/features/org.eclipse.emf.gwt.edit.ui-feature/feature.xml
index ef126e50b..9334f3a94 100644
--- a/features/org.eclipse.emf.gwt.edit.ui-feature/feature.xml
+++ b/features/org.eclipse.emf.gwt.edit.ui-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.7.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.gwt.sdk-feature/feature.xml b/features/org.eclipse.emf.gwt.sdk-feature/feature.xml
index 6fa8249fa..031b3b713 100644
--- a/features/org.eclipse.emf.gwt.sdk-feature/feature.xml
+++ b/features/org.eclipse.emf.gwt.sdk-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.9.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.license-feature/epl-v10.html b/features/org.eclipse.emf.license-feature/epl-v10.html
index cb1073a4b..3998fcebe 100755
--- a/features/org.eclipse.emf.license-feature/epl-v10.html
+++ b/features/org.eclipse.emf.license-feature/epl-v10.html
@@ -1,303 +1,260 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<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">
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <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>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
 </head>
 
-<body lang="EN-US" style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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:.5in'><span style='font-size:10.0pt'>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:.5in'><span style='font-size:10.0pt'>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:.5in'><span style='font-size:10.0pt'>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:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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:.5in'><span style='font-size:10.0pt'>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:.5in'><span style='font-size:10.0pt'>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:.5in'><span style='font-size:10.0pt'>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:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>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:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>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:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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:10.0pt'>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:10.0pt'>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
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
 distribution of the Program as soon as reasonably practicable. However,
 Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>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:10.0pt'>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>
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
 
 </body>
 
diff --git a/features/org.eclipse.emf.license-feature/feature.properties b/features/org.eclipse.emf.license-feature/feature.properties
index daa5a5b28..6fec02940 100755
--- a/features/org.eclipse.emf.license-feature/feature.properties
+++ b/features/org.eclipse.emf.license-feature/feature.properties
@@ -1,4 +1,3 @@
-
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
@@ -7,7 +6,7 @@ licenseURL=license.html
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-February 1, 2011\n\
+April 9, 2014\n\
 \n\
 Usage Of Content\n\
 \n\
@@ -80,7 +79,6 @@ SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\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\
 \n\
 IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
diff --git a/features/org.eclipse.emf.license-feature/feature.xml b/features/org.eclipse.emf.license-feature/feature.xml
index 94760f83e..0361cf151 100755
--- a/features/org.eclipse.emf.license-feature/feature.xml
+++ b/features/org.eclipse.emf.license-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.license"
       label="EMF License"
-      version="2.7.0.qualifier"
+      version="2.8.0.qualifier"
       provider-name="Eclipse Modeling Project">
 
    <description>
diff --git a/features/org.eclipse.emf.license-feature/license.html b/features/org.eclipse.emf.license-feature/license.html
index f19c483b9..c3d34c3c2 100644
--- a/features/org.eclipse.emf.license-feature/license.html
+++ b/features/org.eclipse.emf.license-feature/license.html
@@ -8,7 +8,7 @@
 
 <body lang="EN-US">
 <h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
+<p>April 9, 2014</p>
 
 <h3>Usage Of Content</h3>
 
@@ -62,7 +62,6 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
        <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>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</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>
 
diff --git a/features/org.eclipse.emf.license-feature/rootfiles/epl-v10.html b/features/org.eclipse.emf.license-feature/rootfiles/epl-v10.html
index cb1073a4b..3998fcebe 100755
--- a/features/org.eclipse.emf.license-feature/rootfiles/epl-v10.html
+++ b/features/org.eclipse.emf.license-feature/rootfiles/epl-v10.html
@@ -1,303 +1,260 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<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">
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <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>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
 </head>
 
-<body lang="EN-US" style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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:.5in'><span style='font-size:10.0pt'>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:.5in'><span style='font-size:10.0pt'>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:.5in'><span style='font-size:10.0pt'>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:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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:.5in'><span style='font-size:10.0pt'>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:.5in'><span style='font-size:10.0pt'>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:.5in'><span style='font-size:10.0pt'>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:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>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:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>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:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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:10.0pt'>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:10.0pt'>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
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
 distribution of the Program as soon as reasonably practicable. However,
 Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>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:10.0pt'>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>
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
 
 </body>
 
diff --git a/features/org.eclipse.emf.license-feature/rootfiles/notice.html b/features/org.eclipse.emf.license-feature/rootfiles/notice.html
index f19c483b9..c3d34c3c2 100644
--- a/features/org.eclipse.emf.license-feature/rootfiles/notice.html
+++ b/features/org.eclipse.emf.license-feature/rootfiles/notice.html
@@ -8,7 +8,7 @@
 
 <body lang="EN-US">
 <h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
+<p>April 9, 2014</p>
 
 <h3>Usage Of Content</h3>
 
@@ -62,7 +62,6 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
        <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>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</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>
 
diff --git a/features/org.eclipse.emf.mapping-feature/feature.xml b/features/org.eclipse.emf.mapping-feature/feature.xml
index 2b9a5bc8c..7e47fb690 100644
--- a/features/org.eclipse.emf.mapping-feature/feature.xml
+++ b/features/org.eclipse.emf.mapping-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.7.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.mapping.ecore-feature/feature.xml b/features/org.eclipse.emf.mapping.ecore-feature/feature.xml
index 9c7c27f49..1bd73d810 100644
--- a/features/org.eclipse.emf.mapping.ecore-feature/feature.xml
+++ b/features/org.eclipse.emf.mapping.ecore-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.7.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.mapping.ecore.editor-feature/feature.xml b/features/org.eclipse.emf.mapping.ecore.editor-feature/feature.xml
index 2760f099d..379ae38a1 100644
--- a/features/org.eclipse.emf.mapping.ecore.editor-feature/feature.xml
+++ b/features/org.eclipse.emf.mapping.ecore.editor-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.8.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.mapping.ui-feature/feature.xml b/features/org.eclipse.emf.mapping.ui-feature/feature.xml
index 429c5b536..18aade9d4 100644
--- a/features/org.eclipse.emf.mapping.ui-feature/feature.xml
+++ b/features/org.eclipse.emf.mapping.ui-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.7.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.oda-feature/feature.xml b/features/org.eclipse.emf.oda-feature/feature.xml
index 7bfebda25..dc8140f1f 100755
--- a/features/org.eclipse.emf.oda-feature/feature.xml
+++ b/features/org.eclipse.emf.oda-feature/feature.xml
@@ -5,7 +5,7 @@
       version="1.2.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.oda.ecore-feature/feature.xml b/features/org.eclipse.emf.oda.ecore-feature/feature.xml
index 3dc1f4dcf..2e77ce8dc 100755
--- a/features/org.eclipse.emf.oda.ecore-feature/feature.xml
+++ b/features/org.eclipse.emf.oda.ecore-feature/feature.xml
@@ -5,7 +5,7 @@
       version="1.2.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.oda.ecore.ui-feature/feature.xml b/features/org.eclipse.emf.oda.ecore.ui-feature/feature.xml
index 5bfc93696..bf476d8e6 100755
--- a/features/org.eclipse.emf.oda.ecore.ui-feature/feature.xml
+++ b/features/org.eclipse.emf.oda.ecore.ui-feature/feature.xml
@@ -5,7 +5,7 @@
       version="1.1.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.oda.sdk-feature/feature.xml b/features/org.eclipse.emf.oda.sdk-feature/feature.xml
index 61b9fff6c..bdf7143ed 100755
--- a/features/org.eclipse.emf.oda.sdk-feature/feature.xml
+++ b/features/org.eclipse.emf.oda.sdk-feature/feature.xml
@@ -5,7 +5,7 @@
       version="1.2.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.rap-feature/feature.xml b/features/org.eclipse.emf.rap-feature/feature.xml
index 2ed8b5465..2c2afa27b 100755
--- a/features/org.eclipse.emf.rap-feature/feature.xml
+++ b/features/org.eclipse.emf.rap-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.10.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.rap.common.ui-feature/feature.xml b/features/org.eclipse.emf.rap.common.ui-feature/feature.xml
index d347aefcf..0c92fa2fd 100755
--- a/features/org.eclipse.emf.rap.common.ui-feature/feature.xml
+++ b/features/org.eclipse.emf.rap.common.ui-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.8.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.rap.edit.ui-feature/feature.xml b/features/org.eclipse.emf.rap.edit.ui-feature/feature.xml
index 8b63f5670..ae0afa8ea 100755
--- a/features/org.eclipse.emf.rap.edit.ui-feature/feature.xml
+++ b/features/org.eclipse.emf.rap.edit.ui-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.9.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.rap.sdk-feature/feature.xml b/features/org.eclipse.emf.rap.sdk-feature/feature.xml
index 0fdc586c5..1bfd3ecac 100755
--- a/features/org.eclipse.emf.rap.sdk-feature/feature.xml
+++ b/features/org.eclipse.emf.rap.sdk-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.10.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.sdk-feature/feature.xml b/features/org.eclipse.emf.sdk-feature/feature.xml
index 37351edb9..80a635c67 100644
--- a/features/org.eclipse.emf.sdk-feature/feature.xml
+++ b/features/org.eclipse.emf.sdk-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.10.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/releng/org.eclipse.emf.base.build-feature/feature.xml b/releng/org.eclipse.emf.base.build-feature/feature.xml
index b2b4a50ed..a6c90ab40 100644
--- a/releng/org.eclipse.emf.base.build-feature/feature.xml
+++ b/releng/org.eclipse.emf.base.build-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.10.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/releng/org.eclipse.emf.build-feature/feature.xml b/releng/org.eclipse.emf.build-feature/feature.xml
index b30755851..2d51f3087 100755
--- a/releng/org.eclipse.emf.build-feature/feature.xml
+++ b/releng/org.eclipse.emf.build-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.10.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/releng/org.eclipse.emf.xcore.build-feature/feature.xml b/releng/org.eclipse.emf.xcore.build-feature/feature.xml
index 35f7ff80d..ed9356f64 100644
--- a/releng/org.eclipse.emf.xcore.build-feature/feature.xml
+++ b/releng/org.eclipse.emf.xcore.build-feature/feature.xml
@@ -5,7 +5,7 @@
       version="1.2.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2002-2011 IBM Corporation and others.
diff --git a/tests/org.eclipse.emf.test.ecore.xcore-feature/feature.xml b/tests/org.eclipse.emf.test.ecore.xcore-feature/feature.xml
index 786fa712d..474298fbb 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore-feature/feature.xml
+++ b/tests/org.eclipse.emf.test.ecore.xcore-feature/feature.xml
@@ -5,7 +5,7 @@
       version="1.2.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
diff --git a/tests/org.eclipse.emf.tests-feature/feature.xml b/tests/org.eclipse.emf.tests-feature/feature.xml
index 9775d0c2c..0ad26d37f 100644
--- a/tests/org.eclipse.emf.tests-feature/feature.xml
+++ b/tests/org.eclipse.emf.tests-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.10.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
-      license-feature-version="2.7.0.qualifier">
+      license-feature-version="2.8.0.qualifier">
 
    <description>
       %description
author	Dennis Huebner	2014-04-11 11:55:27 +0000
committer	Dennis Huebner	2014-04-24 14:19:17 +0000
commit	7c92289d4e894d50aa0b7700b9341678320a60fb (patch)
tree	2962cb5e0fd70bbd27622c383b8d9c38751e6fd1
parent	e6b4ca8244f00eadee5c684ec41f098959085b7b (diff)
download	org.eclipse.emf-7c92289d4e894d50aa0b7700b9341678320a60fb.tar.gz org.eclipse.emf-7c92289d4e894d50aa0b7700b9341678320a60fb.tar.xz org.eclipse.emf-7c92289d4e894d50aa0b7700b9341678320a60fb.zip