https://bugs.eclipse.org/bugs/show_bug.cgi?id=536407, migrate to EPL 2.0 and catch up with branch development

Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/about.html b/about.html
index 64c0598..e8b834d 100644
--- a/about.html
+++ b/about.html
@@ -8,13 +8,13 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 1, 2016</p>	
+<p>November 30, 2017</p>	
 <h3>License</h3>
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/notice.html b/notice.html
index c3d34c3..008b801 100644
--- a/notice.html
+++ b/notice.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/org.eclipse.osbp.xtext.reportdsl.feature/LICENSE.txt b/org.eclipse.osbp.xtext.reportdsl.feature/LICENSE.txt
index ff42ad4..fc5938d 100644
--- a/org.eclipse.osbp.xtext.reportdsl.feature/LICENSE.txt
+++ b/org.eclipse.osbp.xtext.reportdsl.feature/LICENSE.txt
@@ -1,161 +1,140 @@
-Eclipse Public License -v 1.0
+Eclipse Foundation Software User Agreement
 
-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.
+November 22, 2017
 
-1. DEFINITIONS
+Usage Of Content
 
-"Contribution" means:
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). 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.
 
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+Applicable Licenses
 
-b) in the case of each subsequent Contributor:
+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 ("EPL"). A copy of the EPL is provided with this Content and is also
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,
+"Program" will mean the Content.
 
-i) changes to the Program, and
+Content includes, but is not limited to, source code, object code, documentation
+and other files maintained in the Eclipse Foundation source code repository
+("Repository") in software modules ("Modules") and made available as
+downloadable archives ("Downloads").
 
-ii) additions to the Program;
+-   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").
+-   Each Plug-in or Fragment may be packaged as a sub-directory or JAR
+    (Java™ ARchive) in a directory named "plugins".
+-   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 and/or
+    Fragments associated with that Feature.
+-   Features may also include other Features ("Included Features"). Within a
+    Feature, files named "feature.xml" may contain a list of the names and
+    version numbers of Included Features.
 
-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.
+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 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 including, but not limited to the following
+locations:
 
-"Contributor" means any person or entity that distributes the Program.
+-   The top-level (root) directory
+-   Plug-in and Fragment directories
+-   Inside Plug-ins and Fragments packaged as JARs
+-   Sub-directories of the directory named "src" of certain Plug-ins
+-   Feature directories
 
-"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.
+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
+("Feature Update License") 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 "license"
+property of files named "feature.properties" 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.
 
-"Program" means the Contributions distributed in accordance with this Agreement.
+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):
 
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+-   Eclipse Public License Version 1.0 (available at
+    http://www.eclipse.org/legal/epl-v10.html)
+-   Eclipse Distribution License Version 1.0 (available at
+    http://www.eclipse.org/licenses/edl-v1.0.html)
+-   Common Public License Version 1.0 (available at
+    http://www.eclipse.org/legal/cpl-v10.html)
+-   Apache Software License 1.1 (available at
+    http://www.apache.org/licenses/LICENSE)
+-   Apache Software License 2.0 (available at
+    http://www.apache.org/licenses/LICENSE-2.0)
+-   Mozilla Public License Version 1.1 (available at
+    http://www.mozilla.org/MPL/MPL-1.1.html)
 
-2. GRANT OF RIGHTS
+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.
 
-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.
+Use of Provisioning Technology
 
-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.
+The Eclipse Foundation makes available provisioning software, examples of which
+include, but are not limited to, p2 and the Eclipse Update Manager
+("Provisioning Technology") for the purpose of allowing users to install
+software, documentation, information and/or other materials (collectively
+"Installable Software"). 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
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").
 
-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.
+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:
 
-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.
+1.  A series of actions may occur ("Provisioning Process") in which a user may
+    execute the Provisioning Technology on a machine ("Target Machine") with the
+    intent of installing, extending or updating the functionality of an
+    Eclipse-based product.
+2.  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.
+3.  Pursuant to the Specification, you will provide to the user the terms and
+    conditions that govern the use of the Installable Software ("Installable
+    Software Agreement") 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.
 
-3. REQUIREMENTS
+Cryptography
 
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+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.
 
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-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;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any
-other party; and
-
-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.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-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.
-
-4. COMMERCIAL DISTRIBUTION
-
-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.
-
-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.
-
-5. NO WARRANTY
-
-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.
-
-6. DISCLAIMER OF LIABILITY
-
-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.
-
-7. GENERAL
-
-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.
-
-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.
-
-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.
-
-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.
-
-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.
\ No newline at end of file
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the
+United States, other countries, or both.
diff --git a/org.eclipse.osbp.xtext.reportdsl.feature/build.properties b/org.eclipse.osbp.xtext.reportdsl.feature/build.properties
index b8920ff..d6b1b0a 100644
--- a/org.eclipse.osbp.xtext.reportdsl.feature/build.properties
+++ b/org.eclipse.osbp.xtext.reportdsl.feature/build.properties
@@ -1,2 +1,2 @@
-bin.includes = license.html,  epl-v10.html,  feature.xml,\
+bin.includes = license.html,  epl-2.0.html,  feature.xml,\
                feature.properties
diff --git a/org.eclipse.osbp.xtext.reportdsl.feature/epl-2.0.html b/org.eclipse.osbp.xtext.reportdsl.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/org.eclipse.osbp.xtext.reportdsl.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/org.eclipse.osbp.xtext.reportdsl.feature/epl-v10.html b/org.eclipse.osbp.xtext.reportdsl.feature/epl-v10.html
deleted file mode 100644
index b398acc..0000000
--- a/org.eclipse.osbp.xtext.reportdsl.feature/epl-v10.html
+++ /dev/null
@@ -1,259 +0,0 @@
-<!--?xml version="1.0" encoding="ISO-8859-1" ?-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Eclipse Public License - Version 1.0</title>
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style>
-
-</head>
-
-<body lang="EN-US">
-
-<h2>Eclipse Public License - v 1.0</h2>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" 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>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"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.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" 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
-("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.</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 "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.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-
-
-</body></html>
\ No newline at end of file
diff --git a/org.eclipse.osbp.xtext.reportdsl.feature/feature.properties b/org.eclipse.osbp.xtext.reportdsl.feature/feature.properties
index 01e550c..fcda7d4 100644
--- a/org.eclipse.osbp.xtext.reportdsl.feature/feature.properties
+++ b/org.eclipse.osbp.xtext.reportdsl.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany).
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0 
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     Cristiano Gavião - initial API and implementation
@@ -30,10 +32,12 @@
 copyright=\
 Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) \n\
 All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
+are made available under the terms of the Eclipse Public License 2.0 \n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
+https://www.eclipse.org/legal/epl-2.0/\n\
 \n\
+SPDX-License-Identifier: EPL-2.0\n\
+\n
 ################ end of copyright property ####################################
 
 # "licenseURL" property - URL of the "Feature License"
@@ -44,126 +48,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™ ARchive) in a directory named "plugins".\n\
+-   A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\
+    associated material. Each Feature may be packaged as a sub-directory in a\n\
+    directory named "features". Within a Feature, files named "feature.xml" may\n\
+    contain a list of the names and version numbers of the Plug-ins and/or\n\
+    Fragments associated with that Feature.\n\
+-   Features may also include other Features ("Included Features"). Within a\n\
+    Feature, files named "feature.xml" may contain a list of the names and\n\
+    version numbers of Included Features.\n\
 \n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
+The terms and conditions governing Plug-ins and Fragments should be contained in\n\
+files named "about.html" ("Abouts"). The terms and conditions governing Features\n\
+and Included Features should be contained in files named "license.html"\n\
+("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\
+directory of a Download or Module including, but not limited to the following\n\
+locations:\n\
 \n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
+-   The top-level (root) directory\n\
+-   Plug-in and Fragment directories\n\
+-   Inside Plug-ins and Fragments packaged as JARs\n\
+-   Sub-directories of the directory named "src" of certain Plug-ins\n\
+-   Feature directories\n\
 \n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using\n\
+the Provisioning Technology (as defined below), you must agree to a license\n\
+("Feature Update License") during the installation process. If the Feature\n\
+contains Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform you\n\
+where you can locate them. Feature Update Licenses may be found in the "license"\n\
+property of files named "feature.properties" found within a Feature. Such\n\
+Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your use of\n\
+the associated Content in that directory.\n\
 \n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\
+OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
 \n\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - 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-v10.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/org.eclipse.osbp.xtext.reportdsl.feature/license.html b/org.eclipse.osbp.xtext.reportdsl.feature/license.html
index 6e579a5..008b801 100644
--- a/org.eclipse.osbp.xtext.reportdsl.feature/license.html
+++ b/org.eclipse.osbp.xtext.reportdsl.feature/license.html
@@ -1,164 +1,189 @@
-<!--?xml version="1.0" encoding="ISO-8859-1" ?-->
+<?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">
+<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>February 1, 2011</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 "CONTENT").  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
-   ("EPL").  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, "Program" 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 ("Repository") in software modules ("Modules") and made 
-available as downloadable archives ("Downloads").</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 ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&#8482; ARchive) in a directory named "plugins".</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 "features".  Within a Feature, files 
-named "feature.xml" 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 ("Included 
-Features"). Within a Feature, files named "feature.xml" 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 "about.html" ("Abouts"). The terms and 
-conditions governing Features and
-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
-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 "src" 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 ("Feature Update License") 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 "license" property of files named "feature.properties" 
-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>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>
+	<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 ("Provisioning Technology") for the purpose of 
-allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). 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>
-   ("Specification").</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 ("Provisioning Process") in 
-which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") 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 ("Installable Software Agreement") 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>
-
-
-</body></html>
\ No newline at end of file
+	<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/org.eclipse.osbp.xtext.reportdsl.feature/pom.xml b/org.eclipse.osbp.xtext.reportdsl.feature/pom.xml
index 224d955..ae5f36c 100644
--- a/org.eclipse.osbp.xtext.reportdsl.feature/pom.xml
+++ b/org.eclipse.osbp.xtext.reportdsl.feature/pom.xml
@@ -2,9 +2,11 @@
 <!--#======================================================================= -->
 <!--# Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany). -->
 <!--# All rights reserved. This program and the accompanying materials -->
-<!--# are made available under the terms of the Eclipse Public License v1.0 -->
+<!--# are made available under the terms of the Eclipse Public License 2.0  -->
 <!--# which accompanies this distribution, and is available at -->
-<!--# http://www.eclipse.org/legal/epl-v10.html -->
+<!--# https://www.eclipse.org/legal/epl-2.0/    -->
+<!--#                                           -->
+<!--# SPDX-License-Identifier: EPL-2.0          -->
 <!--# -->
 <!--# Contributors: -->
 <!--# Christophe Loetz  (Loetz GmbH&Co.KG) - Initial implementation API and implementation -->
diff --git a/org.eclipse.osbp.xtext.reportdsl.ide/pom.xml b/org.eclipse.osbp.xtext.reportdsl.ide/pom.xml
index 168c16c..265f08b 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ide/pom.xml
+++ b/org.eclipse.osbp.xtext.reportdsl.ide/pom.xml
@@ -2,9 +2,11 @@
 <!--#======================================================================= -->
 <!--# Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) -->
 <!--# All rights reserved. This program and the accompanying materials -->
-<!--# are made available under the terms of the Eclipse Public License v1.0 -->
+<!--# are made available under the terms of the Eclipse Public License 2.0  -->
 <!--# which accompanies this distribution, and is available at -->
-<!--# http://www.eclipse.org/legal/epl-v10.html -->
+<!--# https://www.eclipse.org/legal/epl-2.0/    -->
+<!--#                                           -->
+<!--# SPDX-License-Identifier: EPL-2.0          -->
 <!--# -->
 <!--# Contributors: -->
 <!--#     Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation -->
diff --git a/org.eclipse.osbp.xtext.reportdsl.ide/src-gen/org/eclipse/osbp/xtext/reportdsl/ide/AbstractReportDSLIdeModule.java b/org.eclipse.osbp.xtext.reportdsl.ide/src-gen/org/eclipse/osbp/xtext/reportdsl/ide/AbstractReportDSLIdeModule.java
index c151033..33197c7 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ide/src-gen/org/eclipse/osbp/xtext/reportdsl/ide/AbstractReportDSLIdeModule.java
+++ b/org.eclipse.osbp.xtext.reportdsl.ide/src-gen/org/eclipse/osbp/xtext/reportdsl/ide/AbstractReportDSLIdeModule.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ * 
+ *  All rights reserved. This program and 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:
+ * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ * 
  */
 package org.eclipse.osbp.xtext.reportdsl.ide;
 
diff --git a/org.eclipse.osbp.xtext.reportdsl.ide/src-gen/org/eclipse/osbp/xtext/reportdsl/ide/contentassist/antlr/PartialReportDSLContentAssistParser.java b/org.eclipse.osbp.xtext.reportdsl.ide/src-gen/org/eclipse/osbp/xtext/reportdsl/ide/contentassist/antlr/PartialReportDSLContentAssistParser.java
index ca35361..35612f3 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ide/src-gen/org/eclipse/osbp/xtext/reportdsl/ide/contentassist/antlr/PartialReportDSLContentAssistParser.java
+++ b/org.eclipse.osbp.xtext.reportdsl.ide/src-gen/org/eclipse/osbp/xtext/reportdsl/ide/contentassist/antlr/PartialReportDSLContentAssistParser.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ * 
+ *  All rights reserved. This program and 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:
+ * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ * 
  */
 package org.eclipse.osbp.xtext.reportdsl.ide.contentassist.antlr;
 
diff --git a/org.eclipse.osbp.xtext.reportdsl.ide/src-gen/org/eclipse/osbp/xtext/reportdsl/ide/contentassist/antlr/ReportDSLParser.java b/org.eclipse.osbp.xtext.reportdsl.ide/src-gen/org/eclipse/osbp/xtext/reportdsl/ide/contentassist/antlr/ReportDSLParser.java
index 3f1dd0e..c6ac625 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ide/src-gen/org/eclipse/osbp/xtext/reportdsl/ide/contentassist/antlr/ReportDSLParser.java
+++ b/org.eclipse.osbp.xtext.reportdsl.ide/src-gen/org/eclipse/osbp/xtext/reportdsl/ide/contentassist/antlr/ReportDSLParser.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ * 
+ *  All rights reserved. This program and 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:
+ * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ * 
  */
 package org.eclipse.osbp.xtext.reportdsl.ide.contentassist.antlr;
 
diff --git a/org.eclipse.osbp.xtext.reportdsl.ide/src-gen/org/eclipse/osbp/xtext/reportdsl/ide/contentassist/antlr/internal/InternalReportDSLLexer.java b/org.eclipse.osbp.xtext.reportdsl.ide/src-gen/org/eclipse/osbp/xtext/reportdsl/ide/contentassist/antlr/internal/InternalReportDSLLexer.java
index 1620ff7..bb689e8 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ide/src-gen/org/eclipse/osbp/xtext/reportdsl/ide/contentassist/antlr/internal/InternalReportDSLLexer.java
+++ b/org.eclipse.osbp.xtext.reportdsl.ide/src-gen/org/eclipse/osbp/xtext/reportdsl/ide/contentassist/antlr/internal/InternalReportDSLLexer.java
@@ -1,3 +1,17 @@
+/**
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ * 
+ *  All rights reserved. This program and 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:
+ * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ * 
+ */
 package org.eclipse.osbp.xtext.reportdsl.ide.contentassist.antlr.internal;
 
 // Hack: Use our own Lexer superclass by means of import. 
diff --git a/org.eclipse.osbp.xtext.reportdsl.ide/src-gen/org/eclipse/osbp/xtext/reportdsl/ide/contentassist/antlr/internal/InternalReportDSLParser.java b/org.eclipse.osbp.xtext.reportdsl.ide/src-gen/org/eclipse/osbp/xtext/reportdsl/ide/contentassist/antlr/internal/InternalReportDSLParser.java
index 4cbfed9..e6df4ad 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ide/src-gen/org/eclipse/osbp/xtext/reportdsl/ide/contentassist/antlr/internal/InternalReportDSLParser.java
+++ b/org.eclipse.osbp.xtext.reportdsl.ide/src-gen/org/eclipse/osbp/xtext/reportdsl/ide/contentassist/antlr/internal/InternalReportDSLParser.java
@@ -1,3 +1,17 @@
+/**
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ * 
+ *  All rights reserved. This program and 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:
+ * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ * 
+ */
 package org.eclipse.osbp.xtext.reportdsl.ide.contentassist.antlr.internal;
 
 import java.io.InputStream;
diff --git a/org.eclipse.osbp.xtext.reportdsl.ide/src/org/eclipse/osbp/xtext/reportdsl/ide/ReportDSLIdeModule.java b/org.eclipse.osbp.xtext.reportdsl.ide/src/org/eclipse/osbp/xtext/reportdsl/ide/ReportDSLIdeModule.java
index 4b3143e..47a02a4 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ide/src/org/eclipse/osbp/xtext/reportdsl/ide/ReportDSLIdeModule.java
+++ b/org.eclipse.osbp.xtext.reportdsl.ide/src/org/eclipse/osbp/xtext/reportdsl/ide/ReportDSLIdeModule.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ * 
+ *  All rights reserved. This program and 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:
+ * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ * 
  */
 package org.eclipse.osbp.xtext.reportdsl.ide;
 
diff --git a/org.eclipse.osbp.xtext.reportdsl.ide/src/org/eclipse/osbp/xtext/reportdsl/ide/ReportDSLIdeSetup.java b/org.eclipse.osbp.xtext.reportdsl.ide/src/org/eclipse/osbp/xtext/reportdsl/ide/ReportDSLIdeSetup.java
index b5b1110..184e6fd 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ide/src/org/eclipse/osbp/xtext/reportdsl/ide/ReportDSLIdeSetup.java
+++ b/org.eclipse.osbp.xtext.reportdsl.ide/src/org/eclipse/osbp/xtext/reportdsl/ide/ReportDSLIdeSetup.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ * 
+ *  All rights reserved. This program and 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:
+ * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ * 
  */
 package org.eclipse.osbp.xtext.reportdsl.ide;
 
diff --git a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/.classpath b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/.classpath
index 43b9862..502f456 100644
--- a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/.classpath
+++ b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/.classpath
@@ -2,6 +2,7 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" path="src-gen/"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/.project b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/.project
index dc84ba9..b5c2ac5 100644
--- a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/.project
+++ b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/.project
@@ -6,6 +6,11 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
@@ -42,6 +47,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
diff --git a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/LICENSE.txt b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/LICENSE.txt
index ff42ad4..fc5938d 100644
--- a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/LICENSE.txt
+++ b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/LICENSE.txt
@@ -1,161 +1,140 @@
-Eclipse Public License -v 1.0
+Eclipse Foundation Software User Agreement
 
-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.
+November 22, 2017
 
-1. DEFINITIONS
+Usage Of Content
 
-"Contribution" means:
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). 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.
 
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+Applicable Licenses
 
-b) in the case of each subsequent Contributor:
+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 ("EPL"). A copy of the EPL is provided with this Content and is also
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,
+"Program" will mean the Content.
 
-i) changes to the Program, and
+Content includes, but is not limited to, source code, object code, documentation
+and other files maintained in the Eclipse Foundation source code repository
+("Repository") in software modules ("Modules") and made available as
+downloadable archives ("Downloads").
 
-ii) additions to the Program;
+-   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").
+-   Each Plug-in or Fragment may be packaged as a sub-directory or JAR
+    (Java™ ARchive) in a directory named "plugins".
+-   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 and/or
+    Fragments associated with that Feature.
+-   Features may also include other Features ("Included Features"). Within a
+    Feature, files named "feature.xml" may contain a list of the names and
+    version numbers of Included Features.
 
-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.
+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 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 including, but not limited to the following
+locations:
 
-"Contributor" means any person or entity that distributes the Program.
+-   The top-level (root) directory
+-   Plug-in and Fragment directories
+-   Inside Plug-ins and Fragments packaged as JARs
+-   Sub-directories of the directory named "src" of certain Plug-ins
+-   Feature directories
 
-"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.
+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
+("Feature Update License") 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 "license"
+property of files named "feature.properties" 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.
 
-"Program" means the Contributions distributed in accordance with this Agreement.
+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):
 
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+-   Eclipse Public License Version 1.0 (available at
+    http://www.eclipse.org/legal/epl-v10.html)
+-   Eclipse Distribution License Version 1.0 (available at
+    http://www.eclipse.org/licenses/edl-v1.0.html)
+-   Common Public License Version 1.0 (available at
+    http://www.eclipse.org/legal/cpl-v10.html)
+-   Apache Software License 1.1 (available at
+    http://www.apache.org/licenses/LICENSE)
+-   Apache Software License 2.0 (available at
+    http://www.apache.org/licenses/LICENSE-2.0)
+-   Mozilla Public License Version 1.1 (available at
+    http://www.mozilla.org/MPL/MPL-1.1.html)
 
-2. GRANT OF RIGHTS
+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.
 
-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.
+Use of Provisioning Technology
 
-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.
+The Eclipse Foundation makes available provisioning software, examples of which
+include, but are not limited to, p2 and the Eclipse Update Manager
+("Provisioning Technology") for the purpose of allowing users to install
+software, documentation, information and/or other materials (collectively
+"Installable Software"). 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
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").
 
-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.
+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:
 
-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.
+1.  A series of actions may occur ("Provisioning Process") in which a user may
+    execute the Provisioning Technology on a machine ("Target Machine") with the
+    intent of installing, extending or updating the functionality of an
+    Eclipse-based product.
+2.  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.
+3.  Pursuant to the Specification, you will provide to the user the terms and
+    conditions that govern the use of the Installable Software ("Installable
+    Software Agreement") 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.
 
-3. REQUIREMENTS
+Cryptography
 
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+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.
 
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-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;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any
-other party; and
-
-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.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-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.
-
-4. COMMERCIAL DISTRIBUTION
-
-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.
-
-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.
-
-5. NO WARRANTY
-
-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.
-
-6. DISCLAIMER OF LIABILITY
-
-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.
-
-7. GENERAL
-
-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.
-
-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.
-
-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.
-
-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.
-
-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.
\ No newline at end of file
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the
+United States, other countries, or both.
diff --git a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/META-INF/MANIFEST.MF b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/META-INF/MANIFEST.MF
index 35c2057..fa5c501 100644
--- a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/META-INF/MANIFEST.MF
@@ -19,7 +19,8 @@
  mondrian.osgi;bundle-version="[3.5.0,3.5.1)",
  org.eclipse.osbp.xtext.table.common;bundle-version="[0.9.0,0.10.0)",
  org.eclipse.osbp.xtext.datamart.common;bundle-version="[0.9.0,0.10.0)",
- org.slf4j.api;bundle-version="1.7.2"
+ org.slf4j.api;bundle-version="1.7.2",
+ org.eclipse.e4.core.contexts
 Bundle-Activator: org.eclipse.osbp.xtext.reportdsl.oda.datamart.Activator
 Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/*.xml
diff --git a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/about.html b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/about.html
index 64c0598..e8b834d 100644
--- a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/about.html
+++ b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/about.html
@@ -8,13 +8,13 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 1, 2016</p>	
+<p>November 30, 2017</p>	
 <h3>License</h3>
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/about.properties b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/about.properties
index 8730986..e20197a 100644
--- a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/about.properties
+++ b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/about.properties
@@ -1,9 +1,11 @@
 #
 # Copyright (c) 2012, 2016 - Loetz GmbH&Co.KG (Heidelberg)
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0 
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation
@@ -17,9 +19,11 @@
 featureText=\
 Copyright (c) 2012-2016 - Loetz GmbH&Co.KG \n\
 All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
+are made available under the terms of the Eclipse Public License 2.0 \n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
+https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
 \n\
 Contributors:\n\
     Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation\n
diff --git a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/build.properties b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/build.properties
index 5508b7e..4684cb0 100644
--- a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/build.properties
+++ b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/build.properties
@@ -11,13 +11,13 @@
                .settings/,\
                license.html,\
                LICENSE.txt,\
-               epl-v10.html
+               epl-2.0.html
 src.includes = about.properties,  about.mappings,  about.ini,  about.html,  license.html,\
                LICENSE.txt,\
-               epl-v10.html,\
+               epl-2.0.html,\
                license.html,\
                LICENSE.txt,\
-               epl-v10.html
+               epl-2.0.html
 src.includes = about.properties,  about.mappings,  about.ini,  about.html,  license.html,\
                LICENSE.txt,\
-               epl-v10.html			   			   
+               epl-2.0.html			   			   
diff --git a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/epl-2.0.html b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/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/org.eclipse.osbp.xtext.reportdsl.oda.datamart/epl-v10.html b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/epl-v10.html
deleted file mode 100644
index b398acc..0000000
--- a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/epl-v10.html
+++ /dev/null
@@ -1,259 +0,0 @@
-<!--?xml version="1.0" encoding="ISO-8859-1" ?-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Eclipse Public License - Version 1.0</title>
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style>
-
-</head>
-
-<body lang="EN-US">
-
-<h2>Eclipse Public License - v 1.0</h2>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" 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>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"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.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" 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
-("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.</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 "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.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-
-
-</body></html>
\ No newline at end of file
diff --git a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/license.html b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/license.html
index 6e579a5..008b801 100644
--- a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/license.html
+++ b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/license.html
@@ -1,164 +1,189 @@
-<!--?xml version="1.0" encoding="ISO-8859-1" ?-->
+<?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">
+<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>February 1, 2011</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 "CONTENT").  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
-   ("EPL").  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, "Program" 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 ("Repository") in software modules ("Modules") and made 
-available as downloadable archives ("Downloads").</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 ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&#8482; ARchive) in a directory named "plugins".</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 "features".  Within a Feature, files 
-named "feature.xml" 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 ("Included 
-Features"). Within a Feature, files named "feature.xml" 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 "about.html" ("Abouts"). The terms and 
-conditions governing Features and
-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
-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 "src" 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 ("Feature Update License") 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 "license" property of files named "feature.properties" 
-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>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>
+	<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 ("Provisioning Technology") for the purpose of 
-allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). 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>
-   ("Specification").</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 ("Provisioning Process") in 
-which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") 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 ("Installable Software Agreement") 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>
-
-
-</body></html>
\ No newline at end of file
+	<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/org.eclipse.osbp.xtext.reportdsl.oda.datamart/plugin.properties b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/plugin.properties
index dd2a862..f18ff66 100644
--- a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/plugin.properties
+++ b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/plugin.properties
@@ -2,9 +2,11 @@
 #  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
 #                                                                            
 #  All rights reserved. This program and the accompanying materials           
-#  are made available under the terms of the Eclipse Public License v1.0       
+#  are made available under the terms of the Eclipse Public License 2.0        
 #  which accompanies this distribution, and is available at                  
-#  http://www.eclipse.org/legal/epl-v10.html                                 
+#  https://www.eclipse.org/legal/epl-2.0/                                 
+#                                 
+#  SPDX-License-Identifier: EPL-2.0                                 
 #                                                                            
 #  Contributors:                                                      
 # 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/pom.xml b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/pom.xml
index 4ef2012..5283440 100644
--- a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/pom.xml
+++ b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/pom.xml
@@ -2,9 +2,11 @@
 <!--#======================================================================= -->
 <!--# Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) -->
 <!--# All rights reserved. This program and the accompanying materials -->
-<!--# are made available under the terms of the Eclipse Public License v1.0 -->
+<!--# are made available under the terms of the Eclipse Public License 2.0  -->
 <!--# which accompanies this distribution, and is available at -->
-<!--# http://www.eclipse.org/legal/epl-v10.html -->
+<!--# https://www.eclipse.org/legal/epl-2.0/    -->
+<!--#                                           -->
+<!--# SPDX-License-Identifier: EPL-2.0          -->
 <!--# -->
 <!--# Contributors: -->
 <!--#     Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation -->
diff --git a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/Activator.java b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/Activator.java
index 57dc688..aae2280 100644
--- a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/Activator.java
+++ b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/Activator.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *                                                                            
  * All rights reserved. This program and the accompanying materials           
- * are made available under the terms of the Eclipse Public License v1.0       
+ * are made available under the terms of the Eclipse Public License 2.0        
  * which accompanies this distribution, and is available at                  
- * http://www.eclipse.org/legal/epl-v10.html                                 
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  * Contributors:   
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
diff --git a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/ServiceListener.java b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/ServiceListener.java
index c406e23..2676a8c 100644
--- a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/ServiceListener.java
+++ b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/ServiceListener.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *                                                                            
  * All rights reserved. This program and the accompanying materials           
- * are made available under the terms of the Eclipse Public License v1.0       
+ * are made available under the terms of the Eclipse Public License 2.0        
  * which accompanies this distribution, and is available at                  
- * http://www.eclipse.org/legal/epl-v10.html                                 
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  * Contributors:   
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
diff --git a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/CommonConstants.java b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/CommonConstants.java
index 9404caf..6741058 100644
--- a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/CommonConstants.java
+++ b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/CommonConstants.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *                                                                            
  * All rights reserved. This program and the accompanying materials           
- * are made available under the terms of the Eclipse Public License v1.0       
+ * are made available under the terms of the Eclipse Public License 2.0        
  * which accompanies this distribution, and is available at                  
- * http://www.eclipse.org/legal/epl-v10.html                                 
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  * Contributors:   
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
diff --git a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/Connection.java b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/Connection.java
index 2c9f949..58ea226 100644
--- a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/Connection.java
+++ b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/Connection.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *                                                                            
  * All rights reserved. This program and the accompanying materials           
- * are made available under the terms of the Eclipse Public License v1.0       
+ * are made available under the terms of the Eclipse Public License 2.0        
  * which accompanies this distribution, and is available at                  
- * http://www.eclipse.org/legal/epl-v10.html                                 
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  * Contributors:   
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
@@ -142,7 +144,6 @@
 	public void setLocale(ULocale locale) throws OdaException {
 		if(query != null) {
 			query.setLocale(locale.toLocale());
-			
 		}
 	}
 }
diff --git a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/DataSetMetaData.java b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/DataSetMetaData.java
index 848b3d8..ff2357b 100644
--- a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/DataSetMetaData.java
+++ b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/DataSetMetaData.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *                                                                            
  * All rights reserved. This program and the accompanying materials           
- * are made available under the terms of the Eclipse Public License v1.0       
+ * are made available under the terms of the Eclipse Public License 2.0        
  * which accompanies this distribution, and is available at                  
- * http://www.eclipse.org/legal/epl-v10.html                                 
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  * Contributors:   
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
diff --git a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/Driver.java b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/Driver.java
index de48efb..0f9d364 100644
--- a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/Driver.java
+++ b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/Driver.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *                                                                            
  * All rights reserved. This program and the accompanying materials           
- * are made available under the terms of the Eclipse Public License v1.0       
+ * are made available under the terms of the Eclipse Public License 2.0        
  * which accompanies this distribution, and is available at                  
- * http://www.eclipse.org/legal/epl-v10.html                                 
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  * Contributors:   
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
diff --git a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/Query.java b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/Query.java
index 2ca0312..3d15331 100644
--- a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/Query.java
+++ b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/Query.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *                                                                            
  * All rights reserved. This program and the accompanying materials           
- * are made available under the terms of the Eclipse Public License v1.0       
+ * are made available under the terms of the Eclipse Public License 2.0        
  * which accompanies this distribution, and is available at                  
- * http://www.eclipse.org/legal/epl-v10.html                                 
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  * Contributors:   
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
@@ -33,12 +35,10 @@
 import org.eclipse.datatools.connectivity.oda.OdaException;
 import org.eclipse.datatools.connectivity.oda.SortSpec;
 import org.eclipse.datatools.connectivity.oda.spec.QuerySpecification;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.osbp.dsl.common.datatypes.IDto;
 import org.eclipse.osbp.ui.api.customfields.IBlobService;
-import org.eclipse.osbp.ui.api.metadata.IDSLMetadataService;
 import org.eclipse.osbp.ui.api.report.IReportProvider;
-import org.eclipse.osbp.ui.api.themes.IThemeResourceService;
-import org.eclipse.osbp.ui.api.user.IUser;
 import org.eclipse.osbp.utils.vaadin.PropertyLookup;
 import org.eclipse.osbp.xtext.datamart.common.AEntityDatamart;
 import org.eclipse.osbp.xtext.datamart.common.olap.Cell2dTable;
@@ -46,7 +46,6 @@
 import org.eclipse.osbp.xtext.datamartdsl.AxisEnum;
 import org.eclipse.osbp.xtext.reportdsl.oda.datamart.Activator;
 import org.eclipse.osbp.xtext.reportdsl.oda.datamart.ServiceListener;
-import org.eclipse.osbp.xtext.table.common.CellSetIndexedContainer;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.wiring.BundleWiring;
@@ -75,9 +74,7 @@
 	// It is available only after a query is prepared.
 	private IResultSetMetaData fResultSetMetaData = null;
 	private Cell2dTable fResultCellTable = null;
-	private CellSetIndexedContainer fResultFormattedTable = null;
 
-	private IThemeResourceService themeResourceService = null;
 	private String fBundleSymbolicName = null;
 	private String fDatamartClassName = null;
 	private Class<?> fTaskOperativeDtoClass = null;
@@ -88,10 +85,8 @@
 	private Map<String, AEntityDatamart> fDatamartInstanceMap = null;
 	private Map<String, PropertyLookup> fPropertyLookupMap = null;
 	private List<Integer> fAxisFilter = null;
-	private IUser user = null;
 	private Locale locale;
-	private IDSLMetadataService dslMetadataService;
-	private IBlobService blobService;
+	private IEclipseContext eclipseContext;
 	private String queryText = null;
 	private static final Logger LOGGER = LoggerFactory.getLogger(Query.class);
 
@@ -102,7 +97,7 @@
 	public Query(IConnection host, String bundleSymbolicName, String datamartClassName, List<Integer> axisFilter,
 			Class<?> taskOperativeDtoClass, List<IDto> taskInitialOperativeDtos) {
 		if (host == null) {
-			LOGGER.error("HOST ARGUMENT CANNOT BE NULL");
+			LOGGER.error("{}", "HOST ARGUMENT CANNOT BE NULL");
 		}
 		fConnection = host;
 		fBundleSymbolicName = bundleSymbolicName;
@@ -133,16 +128,12 @@
 							fTaskInitialOperativeDtos);
 					if (cellSet != null) {
 						fResultCellTable = new Cell2dTable(cellSet);
-						// --- if property lookups are available, apply it to
-						// the cellset ---
+						// if property lookups are available, apply it to the cellset
 						if (fPropertyLookupMap != null) {
 							List<Integer> coordinateSystem = new ArrayList<>();
 							for (int axis = 0; axis < cellSet.getAxes().size(); axis++) {
 								coordinateSystem.add(0);
 							}
-							fResultFormattedTable = new CellSetIndexedContainer(dslMetadataService, locale,
-									themeResourceService, blobService, fPropertyLookupMap, cellSet, coordinateSystem,
-									false);
 						}
 					}
 				} catch (Exception e) {
@@ -153,7 +144,7 @@
 				}
 			}
 		} else {
-			LOGGER.error("NULL QUERY TEXT");
+			LOGGER.error("{}", "NULL QUERY TEXT");
 		}
 	}
 
@@ -176,21 +167,11 @@
 			if (context instanceof Map) {
 				@SuppressWarnings("rawtypes")
 				Map appContext = (Map) context;
-				if (appContext.get(IReportProvider.APPCONTEXT_THEMERESOURCESERVICE) != null) {
-					themeResourceService = (IThemeResourceService) appContext
-							.get(IReportProvider.APPCONTEXT_THEMERESOURCESERVICE);
+				if (appContext.get(IReportProvider.APPCONTEXT_ECLIPSECONTEXT) != null) {
+					eclipseContext = (IEclipseContext) appContext
+							.get(IReportProvider.APPCONTEXT_ECLIPSECONTEXT);
 				}
-				if (appContext.get(IReportProvider.APPCONTEXT_DSLMETADATASERVICE) != null) {
-					dslMetadataService = (IDSLMetadataService) appContext
-							.get(IReportProvider.APPCONTEXT_DSLMETADATASERVICE);
-				}
-				if (appContext.get(IReportProvider.APPCONTEXT_BLOBSERVICE) != null) {
-					blobService = (IBlobService) appContext.get(IReportProvider.APPCONTEXT_BLOBSERVICE);
-				}
-				if (appContext.get(IReportProvider.APPCONTEXT_USER) != null) {
-					user = (IUser) appContext.get(IReportProvider.APPCONTEXT_USER);
-				}
-				locale = user.getLocale();
+//				locale = user.getLocale();
 				if (appContext.get(IReportProvider.APPCONTEXT_DATAMARTINSTANCE) != null) {
 					fDatamartInstanceMap = (Map<String, AEntityDatamart>) appContext.get(IReportProvider.APPCONTEXT_DATAMARTINSTANCE);
 				}
@@ -266,7 +247,7 @@
 					StringWriter sw = new StringWriter();
 					e.printStackTrace(new PrintWriter(sw));
 					String exceptionDetails = sw.toString();
-					LOGGER.error("You have to use the class loader from the corresponding bundle as the current context class loader:{}", exceptionDetails);  		
+					LOGGER.error("{}", "You have to use the class loader from the corresponding bundle as the current context class loader:{}", exceptionDetails);  		
 				}
 			}
 		}
@@ -295,7 +276,6 @@
 		fConnection = null;
 		fResultSetMetaData = null;
 		fResultCellTable = null;
-		fResultFormattedTable = null;
 	}
 
 	/*
@@ -312,7 +292,7 @@
 	 * @see org.eclipse.datatools.connectivity.oda.IQuery#executeQuery()
 	 */
 	public IResultSet executeQuery() throws OdaException {
-		return new ResultSet(fResultCellTable, this.fResultSetMetaData, blobService);
+		return new ResultSet(fResultCellTable, this.fResultSetMetaData, eclipseContext.get(IBlobService.class));
 	}
 
 	/*
@@ -509,7 +489,7 @@
 	 */
 	private void validateOpenConnection() throws OdaException {
 		if (!fConnection.isOpen()) {
-			LOGGER.error("CONNECTION HAS NOT OPENED");
+			LOGGER.error("{}", "CONNECTION HAS NOT OPENED");
 		}
 	}
 
@@ -552,7 +532,7 @@
 		String[] queryFragments = parsePreparedQueryText(formattedQuery);
 
 		if (queryFragments[2].split(CommonConstants.DELIMITER_COMMA).length != 1) {
-			LOGGER.error("QUERY DOES NOT SUPPORT CROSS TABLE");
+			LOGGER.error("{}", "QUERY DOES NOT SUPPORT CROSS TABLE");
 		}
 	}
 
@@ -566,7 +546,7 @@
 	 */
 	private void validateNonEmptyQueryText(String formattedQuery) throws OdaException {
 		if (formattedQuery == null || formattedQuery.length() == 0) {
-			LOGGER.error("QUERYCOMMAND IS EMPTY");
+			LOGGER.error("{}", "QUERYCOMMAND IS EMPTY");
 		}
 	}
 
@@ -590,7 +570,7 @@
 		String[] queryWithoutSELECTKeyword = formattedQuery.split(CommonConstants.DELIMITER_SPACE, 2);
 		if (queryWithoutSELECTKeyword == null || queryWithoutSELECTKeyword.length != 2
 				|| !queryWithoutSELECTKeyword[0].trim().equalsIgnoreCase(CommonConstants.KEYWORD_SELECT)) {
-			LOGGER.error("QUERY COMMAND NOT VALID");
+			LOGGER.error("{}", "QUERY COMMAND NOT VALID");
 		}
 
 		/*
@@ -601,7 +581,7 @@
 		String[] querySelectAndFromFragments = queryWithoutSELECTKeyword[1].split(
 				CommonConstants.DELIMITER_SPACE + CommonConstants.KEYWORD_FROM + CommonConstants.DELIMITER_SPACE);
 		if (querySelectAndFromFragments == null || querySelectAndFromFragments.length != 2) {
-			LOGGER.error("QUERY COMMAND NOT VALID");
+			LOGGER.error("{}", "QUERY COMMAND NOT VALID");
 		}
 
 		String[] result = new String[3];
@@ -681,7 +661,7 @@
 		}
 
 		if (inQuote) {
-			LOGGER.error("QUERY TEXT ERROR");
+			LOGGER.error("{}", "QUERY TEXT ERROR");
 		}
 
 		if (delimiterIndex != -1 && columnsInfoBeginIndex != -1) {
@@ -691,7 +671,7 @@
 		} else if (delimiterIndex == -1 && columnsInfoBeginIndex == -1) {
 			splittedQueryText[0] = trimmedQueryText;
 		} else {
-			LOGGER.error("QUERY TEXT ERROR");
+			LOGGER.error("{}", "QUERY TEXT ERROR");
 		}
 		return splittedQueryText;
 	}
diff --git a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/ResultSet.java b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/ResultSet.java
index 10dd37f..0c5bfe0 100644
--- a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/ResultSet.java
+++ b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/ResultSet.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *                                                                            
  * All rights reserved. This program and the accompanying materials           
- * are made available under the terms of the Eclipse Public License v1.0       
+ * are made available under the terms of the Eclipse Public License 2.0        
  * which accompanies this distribution, and is available at                  
- * http://www.eclipse.org/legal/epl-v10.html                                 
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  * Contributors:   
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
@@ -81,7 +83,7 @@
 				String type = rsmd.getColumnTypeName(resultSetIndex);
 				LOGGER.debug("column:{} type:{} cellIdx:{} resultSetIdx:{}", columnName, type, cellTableIndex, resultSetIndex);
 			}
-		} catch (OdaException e) {
+		} catch (OdaException | NullPointerException e) {
 			StringWriter sw = new StringWriter();
 			e.printStackTrace(new PrintWriter(sw));
 			String exceptionDetails = sw.toString();
@@ -259,10 +261,15 @@
         if	(object instanceof BigDecimal) {
     		LOGGER.debug("resultSetIdx:{} BigDecimal from BigDecimal:{}", resultSetIndex, (BigDecimal)object);
         	return (BigDecimal)object;
-        }
-        else if (object instanceof Double) {
+        } else if (object instanceof Double) {
     		LOGGER.debug("resultSetIdx:{} Double from BigDecimal:{}", resultSetIndex, BigDecimal.valueOf((Double)object));
         	return BigDecimal.valueOf((Double)object);
+        } else if (object instanceof Integer) {
+        	LOGGER.debug("resultSetIdx:{} Integer from BigDecimal:{}", resultSetIndex, BigDecimal.valueOf((Integer)object));
+        	return BigDecimal.valueOf((Integer)object);
+        } else if (object instanceof Long) {
+        	LOGGER.debug("resultSetIdx:{} Long from BigDecimal:{}", resultSetIndex, BigDecimal.valueOf((Long)object));
+        	return BigDecimal.valueOf((Long)object);
         }
         return null;
 	}
@@ -279,8 +286,17 @@
 	 */
 	public Date getDate( int resultSetIndex ) throws OdaException {
         Object object = getObject(resultSetIndex);
-		LOGGER.debug("resultSetIdx:{} Date from Timestamp:{}", resultSetIndex, object instanceof Timestamp ? new Date(((Timestamp)object).getTime()) : null);
-        return object instanceof Timestamp ? new Date(((Timestamp)object).getTime()) : null;
+        Date date = null;
+        String loggerFormat = "";
+        if (object instanceof Date) {
+        	date = (Date) object;
+        	loggerFormat = "resultSetIdx:{} Date:{}";
+        } else if (object instanceof Timestamp) {
+        	date = object instanceof Timestamp ? new Date(((Timestamp)object).getTime()) : null;
+        	loggerFormat = "resultSetIdx:{} Date from Timestamp:{}";
+        }
+        LOGGER.debug(loggerFormat, resultSetIndex, date);
+        return date;
 	}
 
 	/*
@@ -296,7 +312,17 @@
 	public Time getTime( int resultSetIndex ) throws OdaException {
         Object object = getObject(resultSetIndex);
 		LOGGER.debug("resultSetIdx:{} Time from Timestamp:{}", resultSetIndex, object instanceof Timestamp ? new Time(((Timestamp)object).getTime()) : null);
-        return object instanceof Timestamp ? new Time(((Timestamp)object).getTime()) : null;
+        Time time = null;
+        String loggerFormat = "";
+        if (object instanceof Date) {
+        	time = (Time) object;
+        	loggerFormat = "resultSetIdx:{} Time:{}";
+        } else if (object instanceof Timestamp) {
+        	time = object instanceof Timestamp ? new Time(((Timestamp)object).getTime()) : null;
+        	loggerFormat = "resultSetIdx:{} Time from Timestamp:{}";
+        }
+        LOGGER.debug(loggerFormat, resultSetIndex, time);
+        return time;
 	}
 
 	/*
@@ -311,8 +337,9 @@
 	 */
 	public Timestamp getTimestamp( int resultSetIndex ) throws OdaException {
         Object object = getObject(resultSetIndex);
-		LOGGER.debug("resultSetIdx:{} Timestamp:{}", resultSetIndex, object instanceof Timestamp ? (Timestamp)object : null);
-        return object instanceof Timestamp ? (Timestamp)object : null;
+        Timestamp timestamp = object instanceof Timestamp ? (Timestamp)object : null;
+		LOGGER.debug("resultSetIdx:{} Timestamp:{}", resultSetIndex, timestamp);
+        return timestamp;
 	}
 
 	/*
diff --git a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/ResultSetMetaData.java b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/ResultSetMetaData.java
index 1c37506..c0f1a04 100644
--- a/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/ResultSetMetaData.java
+++ b/org.eclipse.osbp.xtext.reportdsl.oda.datamart/src/org/eclipse/osbp/xtext/reportdsl/oda/datamart/impl/ResultSetMetaData.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *                                                                            
  * All rights reserved. This program and the accompanying materials           
- * are made available under the terms of the Eclipse Public License v1.0       
+ * are made available under the terms of the Eclipse Public License 2.0        
  * which accompanies this distribution, and is available at                  
- * http://www.eclipse.org/legal/epl-v10.html                                 
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  * Contributors:   
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
diff --git a/org.eclipse.osbp.xtext.reportdsl.tests/LICENSE.txt b/org.eclipse.osbp.xtext.reportdsl.tests/LICENSE.txt
index ff42ad4..fc5938d 100644
--- a/org.eclipse.osbp.xtext.reportdsl.tests/LICENSE.txt
+++ b/org.eclipse.osbp.xtext.reportdsl.tests/LICENSE.txt
@@ -1,161 +1,140 @@
-Eclipse Public License -v 1.0
+Eclipse Foundation Software User Agreement
 
-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.
+November 22, 2017
 
-1. DEFINITIONS
+Usage Of Content
 
-"Contribution" means:
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). 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.
 
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+Applicable Licenses
 
-b) in the case of each subsequent Contributor:
+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 ("EPL"). A copy of the EPL is provided with this Content and is also
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,
+"Program" will mean the Content.
 
-i) changes to the Program, and
+Content includes, but is not limited to, source code, object code, documentation
+and other files maintained in the Eclipse Foundation source code repository
+("Repository") in software modules ("Modules") and made available as
+downloadable archives ("Downloads").
 
-ii) additions to the Program;
+-   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").
+-   Each Plug-in or Fragment may be packaged as a sub-directory or JAR
+    (Java™ ARchive) in a directory named "plugins".
+-   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 and/or
+    Fragments associated with that Feature.
+-   Features may also include other Features ("Included Features"). Within a
+    Feature, files named "feature.xml" may contain a list of the names and
+    version numbers of Included Features.
 
-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.
+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 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 including, but not limited to the following
+locations:
 
-"Contributor" means any person or entity that distributes the Program.
+-   The top-level (root) directory
+-   Plug-in and Fragment directories
+-   Inside Plug-ins and Fragments packaged as JARs
+-   Sub-directories of the directory named "src" of certain Plug-ins
+-   Feature directories
 
-"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.
+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
+("Feature Update License") 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 "license"
+property of files named "feature.properties" 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.
 
-"Program" means the Contributions distributed in accordance with this Agreement.
+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):
 
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+-   Eclipse Public License Version 1.0 (available at
+    http://www.eclipse.org/legal/epl-v10.html)
+-   Eclipse Distribution License Version 1.0 (available at
+    http://www.eclipse.org/licenses/edl-v1.0.html)
+-   Common Public License Version 1.0 (available at
+    http://www.eclipse.org/legal/cpl-v10.html)
+-   Apache Software License 1.1 (available at
+    http://www.apache.org/licenses/LICENSE)
+-   Apache Software License 2.0 (available at
+    http://www.apache.org/licenses/LICENSE-2.0)
+-   Mozilla Public License Version 1.1 (available at
+    http://www.mozilla.org/MPL/MPL-1.1.html)
 
-2. GRANT OF RIGHTS
+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.
 
-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.
+Use of Provisioning Technology
 
-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.
+The Eclipse Foundation makes available provisioning software, examples of which
+include, but are not limited to, p2 and the Eclipse Update Manager
+("Provisioning Technology") for the purpose of allowing users to install
+software, documentation, information and/or other materials (collectively
+"Installable Software"). 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
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").
 
-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.
+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:
 
-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.
+1.  A series of actions may occur ("Provisioning Process") in which a user may
+    execute the Provisioning Technology on a machine ("Target Machine") with the
+    intent of installing, extending or updating the functionality of an
+    Eclipse-based product.
+2.  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.
+3.  Pursuant to the Specification, you will provide to the user the terms and
+    conditions that govern the use of the Installable Software ("Installable
+    Software Agreement") 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.
 
-3. REQUIREMENTS
+Cryptography
 
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+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.
 
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-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;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any
-other party; and
-
-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.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-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.
-
-4. COMMERCIAL DISTRIBUTION
-
-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.
-
-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.
-
-5. NO WARRANTY
-
-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.
-
-6. DISCLAIMER OF LIABILITY
-
-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.
-
-7. GENERAL
-
-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.
-
-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.
-
-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.
-
-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.
-
-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.
\ No newline at end of file
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the
+United States, other countries, or both.
diff --git a/org.eclipse.osbp.xtext.reportdsl.tests/about.html b/org.eclipse.osbp.xtext.reportdsl.tests/about.html
index 64c0598..e8b834d 100644
--- a/org.eclipse.osbp.xtext.reportdsl.tests/about.html
+++ b/org.eclipse.osbp.xtext.reportdsl.tests/about.html
@@ -8,13 +8,13 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 1, 2016</p>	
+<p>November 30, 2017</p>	
 <h3>License</h3>
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/org.eclipse.osbp.xtext.reportdsl.tests/about.properties b/org.eclipse.osbp.xtext.reportdsl.tests/about.properties
index 9ee5cbd..d2a4f66 100644
--- a/org.eclipse.osbp.xtext.reportdsl.tests/about.properties
+++ b/org.eclipse.osbp.xtext.reportdsl.tests/about.properties
@@ -1,9 +1,11 @@
 #
 # Copyright (c) 2012, 2016 - Loetz GmbH&Co.KG (Heidelberg)
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0 
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation
@@ -17,9 +19,11 @@
 featureText=\
 Copyright (c) 2012-2016 - Loetz GmbH&Co.KG \n\
 All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
+are made available under the terms of the Eclipse Public License 2.0 \n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
+https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
 \n\
 Contributors:\n\
     Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation\n
diff --git a/org.eclipse.osbp.xtext.reportdsl.tests/epl-2.0.html b/org.eclipse.osbp.xtext.reportdsl.tests/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/org.eclipse.osbp.xtext.reportdsl.tests/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/org.eclipse.osbp.xtext.reportdsl.tests/epl-v10.html b/org.eclipse.osbp.xtext.reportdsl.tests/epl-v10.html
deleted file mode 100644
index b398acc..0000000
--- a/org.eclipse.osbp.xtext.reportdsl.tests/epl-v10.html
+++ /dev/null
@@ -1,259 +0,0 @@
-<!--?xml version="1.0" encoding="ISO-8859-1" ?-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Eclipse Public License - Version 1.0</title>
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style>
-
-</head>
-
-<body lang="EN-US">
-
-<h2>Eclipse Public License - v 1.0</h2>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" 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>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"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.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" 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
-("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.</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 "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.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-
-
-</body></html>
\ No newline at end of file
diff --git a/org.eclipse.osbp.xtext.reportdsl.tests/license.html b/org.eclipse.osbp.xtext.reportdsl.tests/license.html
index 6e579a5..008b801 100644
--- a/org.eclipse.osbp.xtext.reportdsl.tests/license.html
+++ b/org.eclipse.osbp.xtext.reportdsl.tests/license.html
@@ -1,164 +1,189 @@
-<!--?xml version="1.0" encoding="ISO-8859-1" ?-->
+<?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">
+<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>February 1, 2011</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 "CONTENT").  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
-   ("EPL").  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, "Program" 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 ("Repository") in software modules ("Modules") and made 
-available as downloadable archives ("Downloads").</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 ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&#8482; ARchive) in a directory named "plugins".</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 "features".  Within a Feature, files 
-named "feature.xml" 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 ("Included 
-Features"). Within a Feature, files named "feature.xml" 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 "about.html" ("Abouts"). The terms and 
-conditions governing Features and
-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
-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 "src" 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 ("Feature Update License") 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 "license" property of files named "feature.properties" 
-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>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>
+	<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 ("Provisioning Technology") for the purpose of 
-allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). 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>
-   ("Specification").</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 ("Provisioning Process") in 
-which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") 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 ("Installable Software Agreement") 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>
-
-
-</body></html>
\ No newline at end of file
+	<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/org.eclipse.osbp.xtext.reportdsl.tests/pom.xml b/org.eclipse.osbp.xtext.reportdsl.tests/pom.xml
index 5488975..25f36a3 100644
--- a/org.eclipse.osbp.xtext.reportdsl.tests/pom.xml
+++ b/org.eclipse.osbp.xtext.reportdsl.tests/pom.xml
@@ -2,9 +2,11 @@
 <!--#======================================================================= -->
 <!--# Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) -->
 <!--# All rights reserved. This program and the accompanying materials -->
-<!--# are made available under the terms of the Eclipse Public License v1.0 -->
+<!--# are made available under the terms of the Eclipse Public License 2.0  -->
 <!--# which accompanies this distribution, and is available at -->
-<!--# http://www.eclipse.org/legal/epl-v10.html -->
+<!--# https://www.eclipse.org/legal/epl-2.0/    -->
+<!--#                                           -->
+<!--# SPDX-License-Identifier: EPL-2.0          -->
 <!--# -->
 <!--# Contributors: -->
 <!--#     Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation -->
diff --git a/org.eclipse.osbp.xtext.reportdsl.tests/src-gen/org/eclipse/osbp/xtext/reportdsl/tests/ReportDSLInjectorProvider.java b/org.eclipse.osbp.xtext.reportdsl.tests/src-gen/org/eclipse/osbp/xtext/reportdsl/tests/ReportDSLInjectorProvider.java
index f3a991a..3088be6 100644
--- a/org.eclipse.osbp.xtext.reportdsl.tests/src-gen/org/eclipse/osbp/xtext/reportdsl/tests/ReportDSLInjectorProvider.java
+++ b/org.eclipse.osbp.xtext.reportdsl.tests/src-gen/org/eclipse/osbp/xtext/reportdsl/tests/ReportDSLInjectorProvider.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ * 
+ *  All rights reserved. This program and 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:
+ * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ * 
  */
 package org.eclipse.osbp.xtext.reportdsl.tests;
 
diff --git a/org.eclipse.osbp.xtext.reportdsl.tests/xtend-gen/org/eclipse/osbp/xtext/reportdsl/tests/ReportDSLParsingTest.java b/org.eclipse.osbp.xtext.reportdsl.tests/xtend-gen/org/eclipse/osbp/xtext/reportdsl/tests/ReportDSLParsingTest.java
index 1e73ecc..98776a3 100644
--- a/org.eclipse.osbp.xtext.reportdsl.tests/xtend-gen/org/eclipse/osbp/xtext/reportdsl/tests/ReportDSLParsingTest.java
+++ b/org.eclipse.osbp.xtext.reportdsl.tests/xtend-gen/org/eclipse/osbp/xtext/reportdsl/tests/ReportDSLParsingTest.java
@@ -1,5 +1,16 @@
 /**
- * generated by Xtext 2.11.0
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ * 
+ *  All rights reserved. This program and 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:
+ * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ * 
  */
 package org.eclipse.osbp.xtext.reportdsl.tests;
 
diff --git a/org.eclipse.osbp.xtext.reportdsl.ui/LICENSE.txt b/org.eclipse.osbp.xtext.reportdsl.ui/LICENSE.txt
index ff42ad4..fc5938d 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ui/LICENSE.txt
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/LICENSE.txt
@@ -1,161 +1,140 @@
-Eclipse Public License -v 1.0
+Eclipse Foundation Software User Agreement
 
-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.
+November 22, 2017
 
-1. DEFINITIONS
+Usage Of Content
 
-"Contribution" means:
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). 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.
 
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+Applicable Licenses
 
-b) in the case of each subsequent Contributor:
+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 ("EPL"). A copy of the EPL is provided with this Content and is also
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,
+"Program" will mean the Content.
 
-i) changes to the Program, and
+Content includes, but is not limited to, source code, object code, documentation
+and other files maintained in the Eclipse Foundation source code repository
+("Repository") in software modules ("Modules") and made available as
+downloadable archives ("Downloads").
 
-ii) additions to the Program;
+-   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").
+-   Each Plug-in or Fragment may be packaged as a sub-directory or JAR
+    (Java™ ARchive) in a directory named "plugins".
+-   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 and/or
+    Fragments associated with that Feature.
+-   Features may also include other Features ("Included Features"). Within a
+    Feature, files named "feature.xml" may contain a list of the names and
+    version numbers of Included Features.
 
-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.
+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 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 including, but not limited to the following
+locations:
 
-"Contributor" means any person or entity that distributes the Program.
+-   The top-level (root) directory
+-   Plug-in and Fragment directories
+-   Inside Plug-ins and Fragments packaged as JARs
+-   Sub-directories of the directory named "src" of certain Plug-ins
+-   Feature directories
 
-"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.
+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
+("Feature Update License") 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 "license"
+property of files named "feature.properties" 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.
 
-"Program" means the Contributions distributed in accordance with this Agreement.
+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):
 
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+-   Eclipse Public License Version 1.0 (available at
+    http://www.eclipse.org/legal/epl-v10.html)
+-   Eclipse Distribution License Version 1.0 (available at
+    http://www.eclipse.org/licenses/edl-v1.0.html)
+-   Common Public License Version 1.0 (available at
+    http://www.eclipse.org/legal/cpl-v10.html)
+-   Apache Software License 1.1 (available at
+    http://www.apache.org/licenses/LICENSE)
+-   Apache Software License 2.0 (available at
+    http://www.apache.org/licenses/LICENSE-2.0)
+-   Mozilla Public License Version 1.1 (available at
+    http://www.mozilla.org/MPL/MPL-1.1.html)
 
-2. GRANT OF RIGHTS
+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.
 
-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.
+Use of Provisioning Technology
 
-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.
+The Eclipse Foundation makes available provisioning software, examples of which
+include, but are not limited to, p2 and the Eclipse Update Manager
+("Provisioning Technology") for the purpose of allowing users to install
+software, documentation, information and/or other materials (collectively
+"Installable Software"). 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
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").
 
-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.
+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:
 
-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.
+1.  A series of actions may occur ("Provisioning Process") in which a user may
+    execute the Provisioning Technology on a machine ("Target Machine") with the
+    intent of installing, extending or updating the functionality of an
+    Eclipse-based product.
+2.  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.
+3.  Pursuant to the Specification, you will provide to the user the terms and
+    conditions that govern the use of the Installable Software ("Installable
+    Software Agreement") 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.
 
-3. REQUIREMENTS
+Cryptography
 
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+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.
 
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-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;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any
-other party; and
-
-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.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-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.
-
-4. COMMERCIAL DISTRIBUTION
-
-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.
-
-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.
-
-5. NO WARRANTY
-
-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.
-
-6. DISCLAIMER OF LIABILITY
-
-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.
-
-7. GENERAL
-
-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.
-
-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.
-
-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.
-
-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.
-
-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.
\ No newline at end of file
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the
+United States, other countries, or both.
diff --git a/org.eclipse.osbp.xtext.reportdsl.ui/about.html b/org.eclipse.osbp.xtext.reportdsl.ui/about.html
index 64c0598..e8b834d 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ui/about.html
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/about.html
@@ -8,13 +8,13 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 1, 2016</p>	
+<p>November 30, 2017</p>	
 <h3>License</h3>
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/org.eclipse.osbp.xtext.reportdsl.ui/about.properties b/org.eclipse.osbp.xtext.reportdsl.ui/about.properties
index 4110227..61eebfb 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ui/about.properties
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/about.properties
@@ -1,9 +1,11 @@
 #
 # Copyright (c) 2012, 2016 - Loetz GmbH&Co.KG (Heidelberg)
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0 
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation
@@ -17,9 +19,11 @@
 featureText=\
 Copyright (c) 2012-2016 - Loetz GmbH&Co.KG \n\
 All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
+are made available under the terms of the Eclipse Public License 2.0 \n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
+https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
 \n\
 Contributors:\n\
     Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation\n
diff --git a/org.eclipse.osbp.xtext.reportdsl.ui/build.properties b/org.eclipse.osbp.xtext.reportdsl.ui/build.properties
index 9416982..f865dd5 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ui/build.properties
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/build.properties
@@ -15,12 +15,12 @@
                templates/,\
                license.html,\
                LICENSE.txt,\
-               epl-v10.html,\
+               epl-2.0.html,\
                icons/,\
                src/,\
                src-gen/,\
                xtend-gen/
 src.includes = about.properties,  about.mappings,  about.ini,  about.html,  license.html,\
                LICENSE.txt,\
-               epl-v10.html,\
+               epl-2.0.html,\
                icons/
diff --git a/org.eclipse.osbp.xtext.reportdsl.ui/epl-2.0.html b/org.eclipse.osbp.xtext.reportdsl.ui/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/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/org.eclipse.osbp.xtext.reportdsl.ui/epl-v10.html b/org.eclipse.osbp.xtext.reportdsl.ui/epl-v10.html
deleted file mode 100644
index b398acc..0000000
--- a/org.eclipse.osbp.xtext.reportdsl.ui/epl-v10.html
+++ /dev/null
@@ -1,259 +0,0 @@
-<!--?xml version="1.0" encoding="ISO-8859-1" ?-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Eclipse Public License - Version 1.0</title>
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style>
-
-</head>
-
-<body lang="EN-US">
-
-<h2>Eclipse Public License - v 1.0</h2>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" 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>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"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.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" 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
-("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.</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 "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.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-
-
-</body></html>
\ No newline at end of file
diff --git a/org.eclipse.osbp.xtext.reportdsl.ui/license.html b/org.eclipse.osbp.xtext.reportdsl.ui/license.html
index 6e579a5..008b801 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ui/license.html
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/license.html
@@ -1,164 +1,189 @@
-<!--?xml version="1.0" encoding="ISO-8859-1" ?-->
+<?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">
+<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>February 1, 2011</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 "CONTENT").  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
-   ("EPL").  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, "Program" 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 ("Repository") in software modules ("Modules") and made 
-available as downloadable archives ("Downloads").</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 ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&#8482; ARchive) in a directory named "plugins".</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 "features".  Within a Feature, files 
-named "feature.xml" 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 ("Included 
-Features"). Within a Feature, files named "feature.xml" 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 "about.html" ("Abouts"). The terms and 
-conditions governing Features and
-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
-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 "src" 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 ("Feature Update License") 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 "license" property of files named "feature.properties" 
-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>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>
+	<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 ("Provisioning Technology") for the purpose of 
-allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). 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>
-   ("Specification").</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 ("Provisioning Process") in 
-which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") 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 ("Installable Software Agreement") 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>
-
-
-</body></html>
\ No newline at end of file
+	<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/org.eclipse.osbp.xtext.reportdsl.ui/pom.xml b/org.eclipse.osbp.xtext.reportdsl.ui/pom.xml
index 95d77ac..6113953 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ui/pom.xml
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/pom.xml
@@ -2,9 +2,11 @@
 <!--#======================================================================= -->
 <!--# Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) -->
 <!--# All rights reserved. This program and the accompanying materials -->
-<!--# are made available under the terms of the Eclipse Public License v1.0 -->
+<!--# are made available under the terms of the Eclipse Public License 2.0  -->
 <!--# which accompanies this distribution, and is available at -->
-<!--# http://www.eclipse.org/legal/epl-v10.html -->
+<!--# https://www.eclipse.org/legal/epl-2.0/    -->
+<!--#                                           -->
+<!--# SPDX-License-Identifier: EPL-2.0          -->
 <!--# -->
 <!--# Contributors: -->
 <!--#     Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation -->
diff --git a/org.eclipse.osbp.xtext.reportdsl.ui/src-gen/org/eclipse/osbp/xtext/reportdsl/ui/AbstractReportDSLUiModule.java b/org.eclipse.osbp.xtext.reportdsl.ui/src-gen/org/eclipse/osbp/xtext/reportdsl/ui/AbstractReportDSLUiModule.java
index 57b0e78..af3a7f9 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ui/src-gen/org/eclipse/osbp/xtext/reportdsl/ui/AbstractReportDSLUiModule.java
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/src-gen/org/eclipse/osbp/xtext/reportdsl/ui/AbstractReportDSLUiModule.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ * 
+ *  All rights reserved. This program and 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:
+ * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ * 
  */
 package org.eclipse.osbp.xtext.reportdsl.ui;
 
diff --git a/org.eclipse.osbp.xtext.reportdsl.ui/src-gen/org/eclipse/osbp/xtext/reportdsl/ui/ReportDSLExecutableExtensionFactory.java b/org.eclipse.osbp.xtext.reportdsl.ui/src-gen/org/eclipse/osbp/xtext/reportdsl/ui/ReportDSLExecutableExtensionFactory.java
index e81ea68..facd3f5 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ui/src-gen/org/eclipse/osbp/xtext/reportdsl/ui/ReportDSLExecutableExtensionFactory.java
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/src-gen/org/eclipse/osbp/xtext/reportdsl/ui/ReportDSLExecutableExtensionFactory.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ * 
+ *  All rights reserved. This program and 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:
+ * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ * 
  */
 package org.eclipse.osbp.xtext.reportdsl.ui;
 
diff --git a/org.eclipse.osbp.xtext.reportdsl.ui/src-gen/org/eclipse/osbp/xtext/reportdsl/ui/contentassist/AbstractReportDSLProposalProvider.java b/org.eclipse.osbp.xtext.reportdsl.ui/src-gen/org/eclipse/osbp/xtext/reportdsl/ui/contentassist/AbstractReportDSLProposalProvider.java
index f6ceb19..4af58b3 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ui/src-gen/org/eclipse/osbp/xtext/reportdsl/ui/contentassist/AbstractReportDSLProposalProvider.java
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/src-gen/org/eclipse/osbp/xtext/reportdsl/ui/contentassist/AbstractReportDSLProposalProvider.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ * 
+ *  All rights reserved. This program and 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:
+ * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ * 
  */
 package org.eclipse.osbp.xtext.reportdsl.ui.contentassist;
 
diff --git a/org.eclipse.osbp.xtext.reportdsl.ui/src-gen/org/eclipse/osbp/xtext/reportdsl/ui/internal/ReportdslActivator.java b/org.eclipse.osbp.xtext.reportdsl.ui/src-gen/org/eclipse/osbp/xtext/reportdsl/ui/internal/ReportdslActivator.java
index 82ec7c6..3daaac3 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ui/src-gen/org/eclipse/osbp/xtext/reportdsl/ui/internal/ReportdslActivator.java
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/src-gen/org/eclipse/osbp/xtext/reportdsl/ui/internal/ReportdslActivator.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ * 
+ *  All rights reserved. This program and 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:
+ * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ * 
  */
 package org.eclipse.osbp.xtext.reportdsl.ui.internal;
 
diff --git a/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/ReportDSLEObjectHover.java b/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/ReportDSLEObjectHover.java
index 02746dd..747a767 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/ReportDSLEObjectHover.java
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/ReportDSLEObjectHover.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *                                                                            
  * All rights reserved. This program and the accompanying materials           
- * are made available under the terms of the Eclipse Public License v1.0       
+ * are made available under the terms of the Eclipse Public License 2.0        
  * which accompanies this distribution, and is available at                  
- * http://www.eclipse.org/legal/epl-v10.html                                 
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  * Contributors:   
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
diff --git a/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/ReportDSLEObjectHoverDocumentationProvider.java b/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/ReportDSLEObjectHoverDocumentationProvider.java
index fa1b262..d051a21 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/ReportDSLEObjectHoverDocumentationProvider.java
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/ReportDSLEObjectHoverDocumentationProvider.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *                                                                            
  * All rights reserved. This program and the accompanying materials           
- * are made available under the terms of the Eclipse Public License v1.0       
+ * are made available under the terms of the Eclipse Public License 2.0        
  * which accompanies this distribution, and is available at                  
- * http://www.eclipse.org/legal/epl-v10.html                                 
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  * Contributors:   
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
diff --git a/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/ReportDSLEObjectHoverProvider.java b/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/ReportDSLEObjectHoverProvider.java
index 010afc7..9da44d2 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/ReportDSLEObjectHoverProvider.java
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/ReportDSLEObjectHoverProvider.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *                                                                            
  * All rights reserved. This program and the accompanying materials           
- * are made available under the terms of the Eclipse Public License v1.0       
+ * are made available under the terms of the Eclipse Public License 2.0        
  * which accompanies this distribution, and is available at                  
- * http://www.eclipse.org/legal/epl-v10.html                                 
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  * Contributors:   
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
diff --git a/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/ReportDSLUiDocumentationTranslator.java b/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/ReportDSLUiDocumentationTranslator.java
index 3adac6d..bbc1f86 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/ReportDSLUiDocumentationTranslator.java
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/ReportDSLUiDocumentationTranslator.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *                                                                            
  * All rights reserved. This program and the accompanying materials           
- * are made available under the terms of the Eclipse Public License v1.0       
+ * are made available under the terms of the Eclipse Public License 2.0        
  * which accompanies this distribution, and is available at                  
- * http://www.eclipse.org/legal/epl-v10.html                                 
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  * Contributors:   
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
diff --git a/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/ReportDSLUiModule.java b/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/ReportDSLUiModule.java
index f39d893..e6eac78 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/ReportDSLUiModule.java
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/ReportDSLUiModule.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *                                                                            
  * All rights reserved. This program and the accompanying materials           
- * are made available under the terms of the Eclipse Public License v1.0       
+ * are made available under the terms of the Eclipse Public License 2.0        
  * which accompanies this distribution, and is available at                  
- * http://www.eclipse.org/legal/epl-v10.html                                 
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  * Contributors:   
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
diff --git a/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/contentassist/ReportDSLProposalProvider.xtend b/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/contentassist/ReportDSLProposalProvider.xtend
index 72e7bcc..fb6b7d3 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/contentassist/ReportDSLProposalProvider.xtend
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/contentassist/ReportDSLProposalProvider.xtend
@@ -3,9 +3,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *                                                                            
  * All rights reserved. This program and the accompanying materials           
- * are made available under the terms of the Eclipse Public License v1.0       
+ * are made available under the terms of the Eclipse Public License 2.0        
  * which accompanies this distribution, and is available at                  
- * http://www.eclipse.org/legal/epl-v10.html                                 
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  * Contributors:   
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
diff --git a/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/labeling/ReportDSLDescriptionLabelProvider.xtend b/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/labeling/ReportDSLDescriptionLabelProvider.xtend
index 20a280d..37d5534 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/labeling/ReportDSLDescriptionLabelProvider.xtend
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/labeling/ReportDSLDescriptionLabelProvider.xtend
@@ -3,9 +3,11 @@
  *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
  *                                                                            
  *  All rights reserved. This program and the accompanying materials           
- *  are made available under the terms of the Eclipse Public License v1.0       
+ *  are made available under the terms of the Eclipse Public License 2.0        
  *  which accompanies this distribution, and is available at                  
- *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *  https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ *  SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  *  Contributors:                                                      
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/labeling/ReportDSLLabelProvider.xtend b/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/labeling/ReportDSLLabelProvider.xtend
index fdb6b52..f5ce8dd 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/labeling/ReportDSLLabelProvider.xtend
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/labeling/ReportDSLLabelProvider.xtend
@@ -3,9 +3,11 @@
  *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
  *                                                                            
  *  All rights reserved. This program and the accompanying materials           
- *  are made available under the terms of the Eclipse Public License v1.0       
+ *  are made available under the terms of the Eclipse Public License 2.0        
  *  which accompanies this distribution, and is available at                  
- *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *  https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ *  SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  *  Contributors:                                                      
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/outline/ReportDSLOutlineTreeProvider.xtend b/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/outline/ReportDSLOutlineTreeProvider.xtend
index 07b27ec..a590dd6 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/outline/ReportDSLOutlineTreeProvider.xtend
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/outline/ReportDSLOutlineTreeProvider.xtend
@@ -3,9 +3,11 @@
  *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
  *                                                                            
  *  All rights reserved. This program and the accompanying materials           
- *  are made available under the terms of the Eclipse Public License v1.0       
+ *  are made available under the terms of the Eclipse Public License 2.0        
  *  which accompanies this distribution, and is available at                  
- *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *  https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ *  SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  *  Contributors:                                                      
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/quickfix/ReportDSLQuickfixProvider.xtend b/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/quickfix/ReportDSLQuickfixProvider.xtend
index 724e3bf..826886b 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/quickfix/ReportDSLQuickfixProvider.xtend
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/src/org/eclipse/osbp/xtext/reportdsl/ui/quickfix/ReportDSLQuickfixProvider.xtend
@@ -3,9 +3,11 @@
  *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
  *                                                                            
  *  All rights reserved. This program and the accompanying materials           
- *  are made available under the terms of the Eclipse Public License v1.0       
+ *  are made available under the terms of the Eclipse Public License 2.0        
  *  which accompanies this distribution, and is available at                  
- *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *  https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ *  SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  *  Contributors:                                                      
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/contentassist/ColorTextApplier.java b/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/contentassist/ColorTextApplier.java
index 1ca5b41..ce66fcf 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/contentassist/ColorTextApplier.java
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/contentassist/ColorTextApplier.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/contentassist/FileNameTextApplier.java b/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/contentassist/FileNameTextApplier.java
index c94392c..b911eb5 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/contentassist/FileNameTextApplier.java
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/contentassist/FileNameTextApplier.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/contentassist/ReportDSLProposalProvider.java b/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/contentassist/ReportDSLProposalProvider.java
index bdd578b..efa1db6 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/contentassist/ReportDSLProposalProvider.java
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/contentassist/ReportDSLProposalProvider.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/labeling/ReportDSLDescriptionLabelProvider.java b/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/labeling/ReportDSLDescriptionLabelProvider.java
index dc151d4..f865e53 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/labeling/ReportDSLDescriptionLabelProvider.java
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/labeling/ReportDSLDescriptionLabelProvider.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ * 
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/labeling/ReportDSLLabelProvider.java b/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/labeling/ReportDSLLabelProvider.java
index 033bccd..35e5815 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/labeling/ReportDSLLabelProvider.java
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/labeling/ReportDSLLabelProvider.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ * 
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/outline/ReportDSLOutlineTreeProvider.java b/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/outline/ReportDSLOutlineTreeProvider.java
index 2928b5b..b677e00 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/outline/ReportDSLOutlineTreeProvider.java
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/outline/ReportDSLOutlineTreeProvider.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ * 
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/quickfix/ReportDSLQuickfixProvider.java b/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/quickfix/ReportDSLQuickfixProvider.java
index 2cb8caa..3dc56d3 100644
--- a/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/quickfix/ReportDSLQuickfixProvider.java
+++ b/org.eclipse.osbp.xtext.reportdsl.ui/xtend-gen/org/eclipse/osbp/xtext/reportdsl/ui/quickfix/ReportDSLQuickfixProvider.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ * 
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.reportdsl/LICENSE.txt b/org.eclipse.osbp.xtext.reportdsl/LICENSE.txt
index ff42ad4..fc5938d 100644
--- a/org.eclipse.osbp.xtext.reportdsl/LICENSE.txt
+++ b/org.eclipse.osbp.xtext.reportdsl/LICENSE.txt
@@ -1,161 +1,140 @@
-Eclipse Public License -v 1.0
+Eclipse Foundation Software User Agreement
 
-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.
+November 22, 2017
 
-1. DEFINITIONS
+Usage Of Content
 
-"Contribution" means:
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). 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.
 
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+Applicable Licenses
 
-b) in the case of each subsequent Contributor:
+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 ("EPL"). A copy of the EPL is provided with this Content and is also
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,
+"Program" will mean the Content.
 
-i) changes to the Program, and
+Content includes, but is not limited to, source code, object code, documentation
+and other files maintained in the Eclipse Foundation source code repository
+("Repository") in software modules ("Modules") and made available as
+downloadable archives ("Downloads").
 
-ii) additions to the Program;
+-   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").
+-   Each Plug-in or Fragment may be packaged as a sub-directory or JAR
+    (Java™ ARchive) in a directory named "plugins".
+-   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 and/or
+    Fragments associated with that Feature.
+-   Features may also include other Features ("Included Features"). Within a
+    Feature, files named "feature.xml" may contain a list of the names and
+    version numbers of Included Features.
 
-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.
+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 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 including, but not limited to the following
+locations:
 
-"Contributor" means any person or entity that distributes the Program.
+-   The top-level (root) directory
+-   Plug-in and Fragment directories
+-   Inside Plug-ins and Fragments packaged as JARs
+-   Sub-directories of the directory named "src" of certain Plug-ins
+-   Feature directories
 
-"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.
+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
+("Feature Update License") 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 "license"
+property of files named "feature.properties" 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.
 
-"Program" means the Contributions distributed in accordance with this Agreement.
+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):
 
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+-   Eclipse Public License Version 1.0 (available at
+    http://www.eclipse.org/legal/epl-v10.html)
+-   Eclipse Distribution License Version 1.0 (available at
+    http://www.eclipse.org/licenses/edl-v1.0.html)
+-   Common Public License Version 1.0 (available at
+    http://www.eclipse.org/legal/cpl-v10.html)
+-   Apache Software License 1.1 (available at
+    http://www.apache.org/licenses/LICENSE)
+-   Apache Software License 2.0 (available at
+    http://www.apache.org/licenses/LICENSE-2.0)
+-   Mozilla Public License Version 1.1 (available at
+    http://www.mozilla.org/MPL/MPL-1.1.html)
 
-2. GRANT OF RIGHTS
+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.
 
-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.
+Use of Provisioning Technology
 
-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.
+The Eclipse Foundation makes available provisioning software, examples of which
+include, but are not limited to, p2 and the Eclipse Update Manager
+("Provisioning Technology") for the purpose of allowing users to install
+software, documentation, information and/or other materials (collectively
+"Installable Software"). 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
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").
 
-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.
+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:
 
-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.
+1.  A series of actions may occur ("Provisioning Process") in which a user may
+    execute the Provisioning Technology on a machine ("Target Machine") with the
+    intent of installing, extending or updating the functionality of an
+    Eclipse-based product.
+2.  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.
+3.  Pursuant to the Specification, you will provide to the user the terms and
+    conditions that govern the use of the Installable Software ("Installable
+    Software Agreement") 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.
 
-3. REQUIREMENTS
+Cryptography
 
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+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.
 
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-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;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any
-other party; and
-
-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.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-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.
-
-4. COMMERCIAL DISTRIBUTION
-
-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.
-
-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.
-
-5. NO WARRANTY
-
-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.
-
-6. DISCLAIMER OF LIABILITY
-
-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.
-
-7. GENERAL
-
-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.
-
-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.
-
-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.
-
-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.
-
-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.
\ No newline at end of file
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the
+United States, other countries, or both.
diff --git a/org.eclipse.osbp.xtext.reportdsl/about.html b/org.eclipse.osbp.xtext.reportdsl/about.html
index 64c0598..e8b834d 100644
--- a/org.eclipse.osbp.xtext.reportdsl/about.html
+++ b/org.eclipse.osbp.xtext.reportdsl/about.html
@@ -8,13 +8,13 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 1, 2016</p>	
+<p>November 30, 2017</p>	
 <h3>License</h3>
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/org.eclipse.osbp.xtext.reportdsl/about.properties b/org.eclipse.osbp.xtext.reportdsl/about.properties
index 44006c5..196c53d 100644
--- a/org.eclipse.osbp.xtext.reportdsl/about.properties
+++ b/org.eclipse.osbp.xtext.reportdsl/about.properties
@@ -1,9 +1,11 @@
 #
 # Copyright (c) 2012, 2016 - Loetz GmbH&Co.KG (Heidelberg)
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0 
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation
@@ -17,9 +19,11 @@
 featureText=\
 Copyright (c) 2012-2016 - Loetz GmbH&Co.KG \n\
 All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
+are made available under the terms of the Eclipse Public License 2.0 \n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
+https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
 \n\
 Contributors:\n\
     Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation\n
diff --git a/org.eclipse.osbp.xtext.reportdsl/build.properties b/org.eclipse.osbp.xtext.reportdsl/build.properties
index 9661b97..141e8d6 100644
--- a/org.eclipse.osbp.xtext.reportdsl/build.properties
+++ b/org.eclipse.osbp.xtext.reportdsl/build.properties
@@ -16,7 +16,7 @@
                .settings/,\
                license.html,\
                LICENSE.txt,\
-               epl-v10.html,\
+               epl-2.0.html,\
                resources/
 src.includes = about.properties,\
                about.mappings,\
@@ -24,5 +24,5 @@
                about.html,\
                license.html,\
                LICENSE.txt,\
-               epl-v10.html,\
+               epl-2.0.html,\
                resources/
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/AutoText.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/AutoText.java
index 5d19cae..136e24d 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/AutoText.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/AutoText.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/AutoTextEnum.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/AutoTextEnum.java
index ee76639..a460a08 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/AutoTextEnum.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/AutoTextEnum.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BaseStyle.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BaseStyle.java
index 1f93357..184871a 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BaseStyle.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BaseStyle.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BeforeAfterPageBreakEnum.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BeforeAfterPageBreakEnum.java
index 65e2054..4e69c83 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BeforeAfterPageBreakEnum.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BeforeAfterPageBreakEnum.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BinaryAggregationTypeEnum.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BinaryAggregationTypeEnum.java
index a68028f..4c2fdfe 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BinaryAggregationTypeEnum.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BinaryAggregationTypeEnum.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BorderStyle.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BorderStyle.java
index 2c88336..7497b5e 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BorderStyle.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BorderStyle.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BorderType.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BorderType.java
index 384b344..e1b04d6 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BorderType.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BorderType.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2013-2014, Loetz GmbH&Co.KG (Heidelberg)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BorderTypeEnum.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BorderTypeEnum.java
index ac4ff92..cbdab1c 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BorderTypeEnum.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BorderTypeEnum.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BuildInFontFamily.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BuildInFontFamily.java
index 6a387e4..216fd1e 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BuildInFontFamily.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BuildInFontFamily.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BuildInFontFamilyEnum.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BuildInFontFamilyEnum.java
index 60745b2..a7ea2ee 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BuildInFontFamilyEnum.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/BuildInFontFamilyEnum.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Color.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Color.java
index 12aec57..4106e41 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Color.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Color.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Colors.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Colors.java
index 4e2d827..2657d85 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Colors.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Colors.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Container.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Container.java
index aee097c..3c4fb12 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Container.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Container.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/CurrencyFormat.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/CurrencyFormat.java
index 9f4cb57..3688b38 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/CurrencyFormat.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/CurrencyFormat.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/CurrencyFormatCategory.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/CurrencyFormatCategory.java
index f3c21d9..0af02d3 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/CurrencyFormatCategory.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/CurrencyFormatCategory.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2013-2014, Loetz GmbH&Co.KG (Heidelberg)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/CurrencyFormatCategoryEnum.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/CurrencyFormatCategoryEnum.java
index 11e81db..0787820 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/CurrencyFormatCategoryEnum.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/CurrencyFormatCategoryEnum.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/CustomFontFamily.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/CustomFontFamily.java
index 5a1d847..886941c 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/CustomFontFamily.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/CustomFontFamily.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartContainer.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartContainer.java
index 5f7b795..c65d64e 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartContainer.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartContainer.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTable.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTable.java
index d4d3f4a..a0edb0a 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTable.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTable.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableAttribute.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableAttribute.java
index 43093b7..64d1065 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableAttribute.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableAttribute.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableDetail.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableDetail.java
index f759ea8..c9acd8c 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableDetail.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableDetail.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableFooter.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableFooter.java
index 1318ad7..adc83df 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableFooter.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableFooter.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableGroup.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableGroup.java
index fd4587d..a4dca5a 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableGroup.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableGroup.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableGroupFooter.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableGroupFooter.java
index 96589c6..09d0840 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableGroupFooter.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableGroupFooter.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableGroupHeader.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableGroupHeader.java
index a9d7ce8..f8a10a3 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableGroupHeader.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableGroupHeader.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableHeader.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableHeader.java
index ecd667b..2e85b30 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableHeader.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DatamartTableHeader.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DateFormat.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DateFormat.java
index 599809b..fc8c3db 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DateFormat.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DateFormat.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DateFormatCategory.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DateFormatCategory.java
index bba697d..d33d8fe 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DateFormatCategory.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DateFormatCategory.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2013-2014, Loetz GmbH&Co.KG (Heidelberg)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DateFormatCategoryEnum.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DateFormatCategoryEnum.java
index 03847ca..84f2f95 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DateFormatCategoryEnum.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DateFormatCategoryEnum.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DateTimeFormat.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DateTimeFormat.java
index 129c0ab..de1f903 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DateTimeFormat.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DateTimeFormat.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DateTimeFormatCategory.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DateTimeFormatCategory.java
index 3f4ace9..2119d27 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DateTimeFormatCategory.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DateTimeFormatCategory.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2013-2014, Loetz GmbH&Co.KG (Heidelberg)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DateTimeFormatCategoryEnum.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DateTimeFormatCategoryEnum.java
index a352734..c7e694a 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DateTimeFormatCategoryEnum.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/DateTimeFormatCategoryEnum.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Element.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Element.java
index d27ed98..db01587 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Element.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Element.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Font.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Font.java
index c07e471..c39c8a7 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Font.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Font.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/FontFamily.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/FontFamily.java
index 09088f2..4419393 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/FontFamily.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/FontFamily.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/FontStyle.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/FontStyle.java
index 1a0eeea..a94d776 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/FontStyle.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/FontStyle.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2013-2014, Loetz GmbH&Co.KG (Heidelberg)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/FontStyleEnum.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/FontStyleEnum.java
index 7c4b6df..2ecd6b7 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/FontStyleEnum.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/FontStyleEnum.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Fonts.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Fonts.java
index 5525494..ca215e4 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Fonts.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Fonts.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Grid.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Grid.java
index bf7660a..f310f73 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Grid.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Grid.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/GridCell.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/GridCell.java
index 4703b4e..6032399 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/GridCell.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/GridCell.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/GridRow.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/GridRow.java
index 0847edd..e721c83 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/GridRow.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/GridRow.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Image.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Image.java
index cd8fe14..bf4f4a3 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Image.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Image.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ImageSizeEnum.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ImageSizeEnum.java
index 78a89ab..b475eae 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ImageSizeEnum.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ImageSizeEnum.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ImageSourceEnum.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ImageSourceEnum.java
index 1ea3dcb..ea76230 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ImageSourceEnum.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ImageSourceEnum.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/InsidePageBreakEnum.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/InsidePageBreakEnum.java
index 358db6b..ff1a3c3 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/InsidePageBreakEnum.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/InsidePageBreakEnum.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Label.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Label.java
index 2bd89c8..5f1b281 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Label.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Label.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Media.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Media.java
index 305f2b0..20ba441 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Media.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Media.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/MediaStyle.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/MediaStyle.java
index 15481ca..aeab17a 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/MediaStyle.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/MediaStyle.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Medias.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Medias.java
index dad423c..f74cfcf 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Medias.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Medias.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/MultipleAggregationTypeEnum.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/MultipleAggregationTypeEnum.java
index 5f6bed5..2c56f0d 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/MultipleAggregationTypeEnum.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/MultipleAggregationTypeEnum.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/NonTranslatableText.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/NonTranslatableText.java
index 4c95b75..f6eb29d 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/NonTranslatableText.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/NonTranslatableText.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/NumberFormat.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/NumberFormat.java
index 49de692..71f9777 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/NumberFormat.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/NumberFormat.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/NumberFormatCategory.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/NumberFormatCategory.java
index 010b702..de61909 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/NumberFormatCategory.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/NumberFormatCategory.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2013-2014, Loetz GmbH&Co.KG (Heidelberg)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/NumberFormatCategoryEnum.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/NumberFormatCategoryEnum.java
index 3717efd..c027439 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/NumberFormatCategoryEnum.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/NumberFormatCategoryEnum.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/OrientationEnum.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/OrientationEnum.java
index 19b4c2c..3532815 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/OrientationEnum.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/OrientationEnum.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageBreak.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageBreak.java
index 68427f6..3a3ad0b 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageBreak.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageBreak.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageDetail.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageDetail.java
index 5480624..f1f548c 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageDetail.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageDetail.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageFooter.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageFooter.java
index 29c469e..9df639b 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageFooter.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageFooter.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageHeader.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageHeader.java
index 0c03726..fd6e6a1 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageHeader.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageHeader.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageSizeEnum.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageSizeEnum.java
index d656f62..b9dfa80 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageSizeEnum.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageSizeEnum.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageTemplate.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageTemplate.java
index 84421ce..5783042 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageTemplate.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageTemplate.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageTemplates.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageTemplates.java
index e2fcc99..f694d8a 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageTemplates.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PageTemplates.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PureAggregationTypeEnum.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PureAggregationTypeEnum.java
index 63771d9..16796b1 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PureAggregationTypeEnum.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/PureAggregationTypeEnum.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/RenderingEnum.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/RenderingEnum.java
index 6b31a9e..d7cbcc7 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/RenderingEnum.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/RenderingEnum.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Report.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Report.java
index c56c53a..5f052ad 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Report.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Report.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportBase.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportBase.java
index 03aad04..4e57785 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportBase.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportBase.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportDSLFactory.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportDSLFactory.java
index f79dcea..c49c7f9 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportDSLFactory.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportDSLFactory.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportDSLPackage.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportDSLPackage.java
index da7c294..04d7be9 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportDSLPackage.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportDSLPackage.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
@@ -41,16 +43,18 @@
  *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ * 
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
  * <!-- end-model-doc -->
  * @see org.eclipse.osbp.xtext.reportdsl.ReportDSLFactory
  * @model kind="package"
- *        annotation="http://www.eclipse.org/emf/2002/GenModel fileExtensions='report' modelName='ReportDSL' prefix='ReportDSL' updateClasspath='false' loadInitialization='false' literalsInterface='true' copyrightText='Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)\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 Based on ideas from Xtext, Xtend, Xcore\r\n  \r\n Contributors:  \r\n \t\tChristophe Loetz  (Loetz GmbH&Co.KG) - Initial implementation \r\n ' basePackage='org.eclipse.osbp.xtext'"
+ *        annotation="http://www.eclipse.org/emf/2002/GenModel fileExtensions='report' modelName='ReportDSL' prefix='ReportDSL' updateClasspath='false' loadInitialization='false' literalsInterface='true' copyrightText='Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)\r\n All rights reserved. This program and the accompanying materials \r\n are made available under the terms of the Eclipse Public License 2.0  \r\n which accompanies this distribution, and is available at \r\n https://www.eclipse.org/legal/epl-2.0/ \r\n \r\n SPDX-License-Identifier: EPL-2.0 \r\n\r\n Based on ideas from Xtext, Xtend, Xcore\r\n  \r\n Contributors:  \r\n \t\tChristophe Loetz  (Loetz GmbH&Co.KG) - Initial implementation \r\n ' basePackage='org.eclipse.osbp.xtext'"
  *        annotation="http://www.eclipse.org/emf/2002/Ecore rootPackage='reportdsl'"
  * @generated
  */
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportDesign.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportDesign.java
index 2c8f8c5..7e58976 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportDesign.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportDesign.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportDesignFile.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportDesignFile.java
index 7b00cbf..a22032d 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportDesignFile.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportDesignFile.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportDesignTemplate.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportDesignTemplate.java
index 4cf0049..51c3e52 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportDesignTemplate.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportDesignTemplate.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportLazyResolver.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportLazyResolver.java
index ef53718..17f6f23 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportLazyResolver.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportLazyResolver.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportModel.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportModel.java
index ee72da3..32d7899 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportModel.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportModel.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportPackage.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportPackage.java
index 7a5f3c9..4a3cf5b 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportPackage.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/ReportPackage.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/SomeFormat.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/SomeFormat.java
index ad8bff4..2bc727e 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/SomeFormat.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/SomeFormat.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/SomeFormats.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/SomeFormats.java
index 66490bf..927d66f 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/SomeFormats.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/SomeFormats.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/SomeGrid.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/SomeGrid.java
index 066ffd3..599923a 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/SomeGrid.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/SomeGrid.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/StringBinder.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/StringBinder.java
index db84dfc..74b15d7 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/StringBinder.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/StringBinder.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/StringBinderElement.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/StringBinderElement.java
index da04590..84f33e1 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/StringBinderElement.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/StringBinderElement.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/StringBinderValue.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/StringBinderValue.java
index d88b706..efcd091 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/StringBinderValue.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/StringBinderValue.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Style.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Style.java
index f34b06c..352094b 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Style.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Style.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Styles.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Styles.java
index 9edc912..62a1734 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Styles.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Styles.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/SubSubTitle.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/SubSubTitle.java
index fb4be04..739a144 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/SubSubTitle.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/SubSubTitle.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/SubTitle.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/SubTitle.java
index 648da76..ad67e53 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/SubTitle.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/SubTitle.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableAggregation.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableAggregation.java
index d7fdc26..ac40170 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableAggregation.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableAggregation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableAttribute.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableAttribute.java
index 0141287..0f98abe 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableAttribute.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableAttribute.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableBaseAggregation.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableBaseAggregation.java
index 5f29281..5a939ab 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableBaseAggregation.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableBaseAggregation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableBinaryAggregation.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableBinaryAggregation.java
index 0a4937b..b909b4e 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableBinaryAggregation.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableBinaryAggregation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableCellColor.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableCellColor.java
index 8321b35..55a34e7 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableCellColor.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableCellColor.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableDateDayInterval.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableDateDayInterval.java
index a237151..2037066 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableDateDayInterval.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableDateDayInterval.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableDateDayLookup.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableDateDayLookup.java
index 024dc7b..f7750f1 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableDateDayLookup.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableDateDayLookup.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableFormatter.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableFormatter.java
index 57cd5f5..850f44a 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableFormatter.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableFormatter.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableIcon.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableIcon.java
index 056be78..aa2f7bd 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableIcon.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableIcon.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableImage.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableImage.java
index f5fc0e9..030359e 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableImage.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableImage.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableInterval.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableInterval.java
index 63bdae4..b4f6a09 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableInterval.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableInterval.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableLookup.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableLookup.java
index 920be15..6c26c31 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableLookup.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableLookup.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableMultipleAggregation.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableMultipleAggregation.java
index 675d8cd..52e6cf5 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableMultipleAggregation.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableMultipleAggregation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableNumberInterval.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableNumberInterval.java
index 04087bc..98697b7 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableNumberInterval.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableNumberInterval.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableNumberLookup.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableNumberLookup.java
index 29f34ba..c59f6dc 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableNumberLookup.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableNumberLookup.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TablePureAggregation.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TablePureAggregation.java
index 2aef8a1..a9013ea 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TablePureAggregation.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TablePureAggregation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableRangeElement.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableRangeElement.java
index d484e59..abc99f7 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableRangeElement.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableRangeElement.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableStringLookup.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableStringLookup.java
index b860b59..aac449a 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableStringLookup.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableStringLookup.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableTextColor.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableTextColor.java
index 79ff5c2..c6382fa 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableTextColor.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableTextColor.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableTooltip.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableTooltip.java
index d34b707..3ed21fe 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableTooltip.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableTooltip.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableTrend.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableTrend.java
index 834d0b0..8841c7b 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableTrend.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableTrend.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableUnaryAggregation.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableUnaryAggregation.java
index 3af8a18..ec1f899 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableUnaryAggregation.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableUnaryAggregation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableValueElement.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableValueElement.java
index d22bef5..dc0b8b2 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableValueElement.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TableValueElement.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Text.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Text.java
index 571e749..478d28e 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Text.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Text.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TextAlign.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TextAlign.java
index 0c68757..56cbe3c 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TextAlign.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TextAlign.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2013-2014, Loetz GmbH&Co.KG (Heidelberg)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TextAlignEnum.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TextAlignEnum.java
index 8187f13..f423c15 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TextAlignEnum.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TextAlignEnum.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TextContentTypeEnum.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TextContentTypeEnum.java
index e5d8a29..b8b443e 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TextContentTypeEnum.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TextContentTypeEnum.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TextElement.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TextElement.java
index fabede3..0dfa299 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TextElement.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TextElement.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TimeFormat.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TimeFormat.java
index 06e6d69..bf57853 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TimeFormat.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TimeFormat.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TimeFormatCategory.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TimeFormatCategory.java
index cabbeb0..b37b939 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TimeFormatCategory.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TimeFormatCategory.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2013-2014, Loetz GmbH&Co.KG (Heidelberg)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TimeFormatCategoryEnum.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TimeFormatCategoryEnum.java
index 451914c..9e9cf96 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TimeFormatCategoryEnum.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TimeFormatCategoryEnum.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Title.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Title.java
index ea66d80..4bf5790 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Title.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Title.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TranslatableText.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TranslatableText.java
index 46891ac..7547161 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TranslatableText.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TranslatableText.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TrendIconEnum.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TrendIconEnum.java
index 1d99084..385d720 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TrendIconEnum.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/TrendIconEnum.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/UnaryAggregationTypeEnum.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/UnaryAggregationTypeEnum.java
index 0bc8de0..535d0ba 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/UnaryAggregationTypeEnum.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/UnaryAggregationTypeEnum.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/UnitEnum.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/UnitEnum.java
index eaeaaa3..ce3b55e 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/UnitEnum.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/UnitEnum.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/UomoFormat.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/UomoFormat.java
index 1085dc3..8637b41 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/UomoFormat.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/UomoFormat.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/VerticalTextAlignEnum.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/VerticalTextAlignEnum.java
index 1902726..286e45c 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/VerticalTextAlignEnum.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/VerticalTextAlignEnum.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Visibility.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Visibility.java
index 74b0bf9..1972612 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Visibility.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/Visibility.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/WithHeaderFooter.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/WithHeaderFooter.java
index b8314a7..a9f3a3f 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/WithHeaderFooter.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/WithHeaderFooter.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/WithStyle.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/WithStyle.java
index a467346..4c1880d 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/WithStyle.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/WithStyle.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/AutoTextImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/AutoTextImpl.java
index 7215373..13b070d 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/AutoTextImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/AutoTextImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/BaseStyleImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/BaseStyleImpl.java
index a655e63..306fdaa 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/BaseStyleImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/BaseStyleImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/BorderStyleImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/BorderStyleImpl.java
index 6e0af96..a0fb053 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/BorderStyleImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/BorderStyleImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/BuildInFontFamilyImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/BuildInFontFamilyImpl.java
index ddeede2..5a4e01e 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/BuildInFontFamilyImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/BuildInFontFamilyImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ColorImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ColorImpl.java
index 8b7f256..36572f4 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ColorImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ColorImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ColorsImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ColorsImpl.java
index 79b6a89..ecfbdbd 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ColorsImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ColorsImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ContainerImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ContainerImpl.java
index aec73b9..93addd9 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ContainerImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ContainerImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/CurrencyFormatImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/CurrencyFormatImpl.java
index 592eec5..3d108b2 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/CurrencyFormatImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/CurrencyFormatImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/CustomFontFamilyImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/CustomFontFamilyImpl.java
index 593421b..b30ae00 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/CustomFontFamilyImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/CustomFontFamilyImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartContainerImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartContainerImpl.java
index 92d5b6d..cd2d40a 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartContainerImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartContainerImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartTableAttributeImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartTableAttributeImpl.java
index 9b8a4d3..f679c51 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartTableAttributeImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartTableAttributeImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartTableDetailImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartTableDetailImpl.java
index 8454b3b..a1ece5b 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartTableDetailImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartTableDetailImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartTableFooterImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartTableFooterImpl.java
index f1b7275..9db2ed1 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartTableFooterImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartTableFooterImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartTableGroupImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartTableGroupImpl.java
index f2895a1..b3e09b8 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartTableGroupImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartTableGroupImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartTableHeaderImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartTableHeaderImpl.java
index 6a8ada2..800860a 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartTableHeaderImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartTableHeaderImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartTableImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartTableImpl.java
index 4e30fe9..404deab 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartTableImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DatamartTableImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DateFormatImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DateFormatImpl.java
index e9449c8..4567a35 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DateFormatImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DateFormatImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DateTimeFormatImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DateTimeFormatImpl.java
index 0f27697..1448560 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DateTimeFormatImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/DateTimeFormatImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/FontImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/FontImpl.java
index 7187bf5..673501c 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/FontImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/FontImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/FontsImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/FontsImpl.java
index c267dc8..3079fe7 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/FontsImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/FontsImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/GridCellImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/GridCellImpl.java
index eaf8873..4ff7aea 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/GridCellImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/GridCellImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/GridImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/GridImpl.java
index 8bbbb5c..d04f1bf 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/GridImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/GridImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/GridRowImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/GridRowImpl.java
index fc08c2c..fcbdbfe 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/GridRowImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/GridRowImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ImageImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ImageImpl.java
index 8bea2dc..c3c1bf3 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ImageImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ImageImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/LabelImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/LabelImpl.java
index f6d3fa3..539319c 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/LabelImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/LabelImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/MediaImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/MediaImpl.java
index 2ee34c0..4bc3d3b 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/MediaImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/MediaImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/MediaStyleImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/MediaStyleImpl.java
index 50f5090..a396f3e 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/MediaStyleImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/MediaStyleImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/MediasImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/MediasImpl.java
index b1c869b..fe76cb9 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/MediasImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/MediasImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/NonTranslatableTextImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/NonTranslatableTextImpl.java
index 8995332..0bbe6aa 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/NonTranslatableTextImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/NonTranslatableTextImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/NumberFormatImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/NumberFormatImpl.java
index 9f52f2d..9964752 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/NumberFormatImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/NumberFormatImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/PageBreakImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/PageBreakImpl.java
index 03134ff..b4a6faf 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/PageBreakImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/PageBreakImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/PageDetailImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/PageDetailImpl.java
index 0cf67fe..86f1f65 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/PageDetailImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/PageDetailImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/PageFooterImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/PageFooterImpl.java
index 5b876cf..9836892 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/PageFooterImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/PageFooterImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/PageHeaderImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/PageHeaderImpl.java
index 89d95f0..8bcefed 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/PageHeaderImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/PageHeaderImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/PageTemplateImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/PageTemplateImpl.java
index d66d5d7..79f8e7d 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/PageTemplateImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/PageTemplateImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/PageTemplatesImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/PageTemplatesImpl.java
index 47dbd19..33e62d0 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/PageTemplatesImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/PageTemplatesImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportBaseImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportBaseImpl.java
index acea661..fac1617 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportBaseImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportBaseImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportDSLFactoryImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportDSLFactoryImpl.java
index 504dd28..da83c4a 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportDSLFactoryImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportDSLFactoryImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportDSLPackageImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportDSLPackageImpl.java
index b215bc3..ae9c8ca 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportDSLPackageImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportDSLPackageImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportDesignFileImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportDesignFileImpl.java
index c5d31fb..a991cc3 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportDesignFileImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportDesignFileImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportDesignTemplateImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportDesignTemplateImpl.java
index 3e6df7c..9c06e6e 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportDesignTemplateImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportDesignTemplateImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportImpl.java
index 8fba8bb..7f61e76 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportLazyResolverImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportLazyResolverImpl.java
index 6ae1eec..4a34aa5 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportLazyResolverImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportLazyResolverImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportModelImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportModelImpl.java
index 4c98d67..2acd250 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportModelImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportModelImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportPackageImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportPackageImpl.java
index 4137018..360f866 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportPackageImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/ReportPackageImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ *  
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  *   
diff --git a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/SomeFormatImpl.java b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/SomeFormatImpl.java
index 29a513b..f198830 100644
--- a/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/SomeFormatImpl.java
+++ b/org.eclipse.osbp.xtext.reportdsl/emf-gen/org/eclipse/osbp/xtext/reportdsl/impl/SomeFormatImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html 
+ *  https://